Hello community, here is the log from the commit of package vms-empire for openSUSE:Leap:15.2 checked in at 2020-04-05 17:07:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/vms-empire (Old) and /work/SRC/openSUSE:Leap:15.2/.vms-empire.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vms-empire" Sun Apr 5 17:07:07 2020 rev:10 rq:789980 version:1.15 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/vms-empire/vms-empire.changes 2020-01-15 16:28:20.624750755 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vms-empire.new.3248/vms-empire.changes 2020-04-05 17:07:14.946224774 +0200 @@ -1,0 +2,8 @@ +Mon Mar 30 11:47:04 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 1.15 + * Fix for infinite-fighter-tange bug + * New 'J' command to show city production in editing mode. + * Rehosted on GitLab. + +------------------------------------------------------------------- Old: ---- vms-empire-1.14.tar.gz New: ---- vms-empire-1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vms-empire.spec ++++++ --- /var/tmp/diff_new_pack.oQpjcB/_old 2020-04-05 17:07:15.438225299 +0200 +++ /var/tmp/diff_new_pack.oQpjcB/_new 2020-04-05 17:07:15.438225299 +0200 @@ -1,7 +1,7 @@ # # spec file for package vms-empire # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: vms-empire -Version: 1.14 +Version: 1.15 Release: 0 Summary: Simulation of a full-scale war between two emperors -License: GPL-2.0 +License: GPL-2.0-only Group: Amusements/Games/Strategy/Turn Based -Url: http://www.catb.org/~esr/vms-empire/ +URL: http://www.catb.org/~esr/vms-empire/ Source0: http://www.catb.org/~esr/%{name}/%{name}-%{version}.tar.gz -%if 0%{?suse_version} BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%endif BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: update-desktop-files %description The ancestor of all 4x (expand/explore/exploit/exterminate) games. @@ -43,20 +40,18 @@ %setup -q %build -make %{?_smp_mflags} CFLAGS="%{optflags}" +%make_build CFLAGS="%{optflags}" %install %make_install -%if 0%{?suse_version} - %suse_update_desktop_file %{name} -%endif +%suse_update_desktop_file %{name} %files -%defattr(-,root,root) -%doc AUTHORS BUGS COPYING HACKING NEWS README +%license COPYING +%doc AUTHORS BUGS HACKING NEWS README %{_bindir}/%{name} -%{_mandir}/man6/%{name}.6%{ext_man} +%{_mandir}/man6/%{name}.6%{?ext_man} %{_datadir}/appdata/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/ ++++++ vms-empire-1.14.tar.gz -> vms-empire-1.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/Makefile new/vms-empire-1.15/Makefile --- old/vms-empire-1.14/Makefile 2016-01-05 07:49:05.000000000 +0100 +++ new/vms-empire-1.15/Makefile 2020-01-25 02:24:41.000000000 +0100 @@ -4,7 +4,7 @@ # See the file COPYING, distributed with empire, for restriction # and warranty information. -VERS=1.14 +VERS=1.15 # Use -g to compile the program for debugging. #DEBUG = -g -DDEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/NEWS new/vms-empire-1.15/NEWS --- old/vms-empire-1.14/NEWS 2016-01-05 07:49:39.000000000 +0100 +++ new/vms-empire-1.15/NEWS 2020-01-25 02:25:49.000000000 +0100 @@ -1,5 +1,10 @@ vms-empire news +1.15: 2020-01-26 01:20:45Z + Fix for infinite-fighter-tange bug, + New 'J' command to show city production in editing mode. + Rehosted on GitLab. + 1.14: 2016-01-05 06:49:17Z Add an identifying magic cookie and version to save files. Full ANSI prototypes for private functions as well as public. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/compmove.c new/vms-empire-1.15/compmove.c --- old/vms-empire-1.14/compmove.c 2014-12-15 17:26:35.000000000 +0100 +++ new/vms-empire-1.15/compmove.c 2020-01-24 18:40:56.000000000 +0100 @@ -417,7 +417,7 @@ if (obj->type == FIGHTER && obj->hits > 0) { if (comp_map[obj->loc].contents == 'X') obj->moved = piece_attr[FIGHTER].speed; - else if (obj->range == 0) { + else if (obj->range <= 0) { pdebug ("Fighter at %d crashed and burned\n", loc_disp(obj->loc)); ksend ("Fighter at %d crashed and burned\n", loc_disp(obj->loc)); kill_obj (obj, obj->loc); /* crash & burn */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/control new/vms-empire-1.15/control --- old/vms-empire-1.14/control 2015-04-08 19:51:01.000000000 +0200 +++ new/vms-empire-1.15/control 2020-01-24 18:40:56.000000000 +0100 @@ -17,11 +17,7 @@ XBS-HTML-Target: index.html -XBS-Repository-URL: http://thyrsus.com/gitweb/?p=vms-empire.git - -XBS-Developer-Clone: [email protected]:vms-empire - -XBS-Anonymous-Clone: git://thyrsus.com/repositories/vms-empire.git +XBS-Repository-URL: https://gitlab.com/esr/vms-empire XBS-OpenHub-URL: https://www.openhub.net/p/vms-empire diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/data.c new/vms-empire-1.15/data.c --- old/vms-empire-1.14/data.c 2014-12-15 17:26:35.000000000 +0100 +++ new/vms-empire-1.15/data.c 2020-01-24 18:40:56.000000000 +0100 @@ -246,6 +246,7 @@ "Grope: set func to explore", "Help: display this text", "I <dir>: set func to dir", + "J: show all city's production", "Kill: set func to awake", "Land: set func to land", "Mark: mark piece", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/display.c new/vms-empire-1.15/display.c --- old/vms-empire-1.14/display.c 2014-12-15 17:26:35.000000000 +0100 +++ new/vms-empire-1.15/display.c 2020-01-24 18:40:56.000000000 +0100 @@ -31,6 +31,7 @@ static void show_loc(view_map_t vmap[],loc_t loc); static void disp_square(view_map_t *vp); +static void disp_city_prod(loc_t t); static bool on_screen(loc_t loc); #ifdef A_COLOR @@ -204,7 +205,11 @@ r = loc_row (loc); c = loc_col (loc); (void) move (r-ref_row+NUMTOPS, c-ref_col); - disp_square(&vmap[loc]); + + if (showprod && vmap[loc].contents == 'O') + disp_city_prod(loc); + else + disp_square(&vmap[loc]); save_cursor = loc; /* remember cursor location */ (void) move (r-ref_row+NUMTOPS, c-ref_col); } @@ -338,6 +343,7 @@ attr = COLOR_PAIR(COLOR_WHITE); break; } + attron(attr); #endif /* A_COLOR */ (void) addch ((chtype)vp->contents); @@ -347,6 +353,27 @@ #endif /* A_COLOR */ } +/* +Routine to show city production instead of boring O +*/ + +static void disp_city_prod(loc_t t) { + chtype attr; + city_info_t *cityp; + + cityp = find_city (t); + ASSERT (cityp != NULL); + + attr = COLOR_PAIR(COLOR_CYAN); + attron(attr); + + (void) addch ((chtype)piece_attr[(int)cityp->prod].sname); + + attroff(attr); + attron(COLOR_PAIR(COLOR_WHITE)); +} + + /* Display the portion of the map that appears on the screen. @@ -365,7 +392,10 @@ for (c = ref_col; c < ref_col + display_cols && c < MAP_WIDTH; c++) { t = row_col_loc (r, c); (void) move (r-ref_row+NUMTOPS, c-ref_col); - disp_square(&vmap[t]); + if (showprod && vmap[t].contents == 'O') + disp_city_prod(t); + else + disp_square(&vmap[t]); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/edit.c new/vms-empire-1.15/edit.c --- old/vms-empire-1.14/edit.c 2014-12-15 01:46:31.000000000 +0100 +++ new/vms-empire-1.15/edit.c 2020-01-24 18:40:56.000000000 +0100 @@ -36,6 +36,7 @@ path_start = -1; /* not building a path yet */ + showprod = false; comment ("Edit mode..."); for (;;) { /* until user gives command to leave */ @@ -59,6 +60,10 @@ case 'I': /* directional stasis */ e_stasis (edit_cursor); break; + case 'J': /* Redraw map showing city production */ + showprod = true; + sector_change (); // Force redraw */ + break; case 'K': /* wake up anything and everything */ e_wake (edit_cursor); break; @@ -73,6 +78,10 @@ e_end (&path_start, edit_cursor, path_type); break; case 'O': /* leave edit mode */ + if (showprod) { + showprod = false; + sector_change (); // Force redraw */ + } e_leave (); return; case 'P': /* print new sector */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/extern.h new/vms-empire-1.15/extern.h --- old/vms-empire-1.14/extern.h 2014-12-15 17:26:35.000000000 +0100 +++ new/vms-empire-1.15/extern.h 2020-01-24 18:40:56.000000000 +0100 @@ -83,6 +83,7 @@ int user_score; /* "score" for user and computer */ int comp_score; char *savefile; +bool showprod; /* Screen updating macros */ #define display_loc_u(loc) display_loc(USER,user_map,loc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/game.c new/vms-empire-1.15/game.c --- old/vms-empire-1.14/game.c 2014-12-15 17:36:24.000000000 +0100 +++ new/vms-empire-1.15/game.c 2020-01-24 18:40:56.000000000 +0100 @@ -94,7 +94,9 @@ #define MAX_HEIGHT 999 /* highest height */ /* these arrays give some compilers problems when they are automatic */ -static int height[2][MAP_SIZE]; +/* MAP_SIZE+1 to eleminate compiler warning. I think the loop is wrong + and goes 1 too high, but safer to just increase here */ +static int height[2][MAP_SIZE+1]; static int height_count[MAX_HEIGHT+1]; void make_map(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/object.c new/vms-empire-1.15/object.c --- old/vms-empire-1.14/object.c 2014-12-15 01:57:48.000000000 +0100 +++ new/vms-empire-1.15/object.c 2020-01-24 18:40:56.000000000 +0100 @@ -416,7 +416,7 @@ while (obj->moved < obj_moves (obj)) { move_sat1 (obj); - if (obj->range == 0) { + if (obj->range <= 0) { if (obj->owner == USER) comment ("Satellite at %d crashed and burned.", loc_disp(obj->loc)); ksend ("Satellite at %d crashed and burned.", loc_disp(obj->loc)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vms-empire-1.14/usermove.c new/vms-empire-1.15/usermove.c --- old/vms-empire-1.14/usermove.c 2014-12-15 17:26:35.000000000 +0100 +++ new/vms-empire-1.15/usermove.c 2020-01-24 18:40:56.000000000 +0100 @@ -181,7 +181,9 @@ obj->func = NOFUNC; comment ("Landing confirmed."); } - else if (obj->range == 0) { + /* range can be less than zero if fighter survives many attacks. + It loses 1 unit of range on every attack it survives. */ + else if (obj->range <= 0) { comment ("Fighter at %d crashed and burned.",loc_disp(obj->loc)); kill_obj (obj, obj->loc); }
