diff --git a/ChangeLog b/ChangeLog index 3ef41dc..90df6d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-07-20 Krzysztof Kosciuszkiewicz + + * V170 + + * Bumped up version to 0.4.5 + + * gx.c (gxDisplayVirtual): bugfix + + * Makefile.in: include new images data directory + + * raceintospace.spec.in: changed descriptions (please check) + + * os_win32/installer.nsi.in: update to current version, change icon + 2007-07-20 Pace Willisson * V169 diff --git a/Makefile.in b/Makefile.in index 33f5b5d..ab95a2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,11 +160,11 @@ tar: $(EXTRA_SOURCES) datatar: rm -f $(PACKAGE_TARNAME)-data.tar.gz - tar -czhvf ${PACKAGE_TARNAME}-data.tar.gz audio video gamedata + tar -czhvf ${PACKAGE_TARNAME}-data.tar.gz audio video gamedata images datazip: rm -f $(PACKAGE_TARNAME)-data.zip - zip -r ${PACKAGE_TARNAME}-data.zip audio video gamedata + zip -r ${PACKAGE_TARNAME}-data.zip audio video gamedata images # Personal Makefile -include Makefile.$(LOGNAME) diff --git a/ast4.c b/ast4.c index b35d62a..002b180 100644 --- a/ast4.c +++ b/ast4.c @@ -791,7 +791,7 @@ void Programs(char plr,char prog) if (Data->P[plr].Pool[tst].Prime>0) { OutBox(245,106,314,118); - gxDisplayVirtual(75,43,244,173,0,&vhptr,75,43); + gxDisplayVirtual(75,43,244,173,0,&vhptr,75,43); ShBox(75,43,244,173);IOBox(81,152,238,167); InBox(81,70,238,113); RectFill(82,71,237,112,7+3*plr);grSetColor(1); diff --git a/configure.in b/configure.in index f3853bd..266d128 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl =========================== dnl === Initialize autoconf === dnl =========================== -AC_INIT(Race Into Space,0.4.2,mkmccarty@raceintospace.org,raceintospace) +AC_INIT(Race Into Space,0.4.5,mkmccarty@raceintospace.org,raceintospace) AC_CONFIG_MACRO_DIR([m4]) diff --git a/gx.c b/gx.c index 24a4a5a..6fda389 100644 --- a/gx.c +++ b/gx.c @@ -165,12 +165,15 @@ gxDisplayVirtual (int from_x0, int from_y0, int width, height; assert(hp); + assert(always_zero == 0); assert(0 <= from_x0 && from_x0 < MAX_X); assert(0 <= from_x1 && from_x1 < MAX_X); assert(0 <= from_y0 && from_y0 < MAX_Y); assert(0 <= from_y1 && from_y1 < MAX_Y); assert(from_x0 <= from_x1); assert(from_y0 <= from_y0); + assert(0 <= to_x && to_x < hp->w); + assert(0 <= to_y && to_y < hp->h); width = from_x1 - from_x0 + 1; height = from_y1 - from_y0 + 1; @@ -179,7 +182,7 @@ gxDisplayVirtual (int from_x0, int from_y0, assert(height <= hp->w); for (row = 0; row < height; row++) { - from_idx = (from_y0 + MAX_X) * hp->w + from_x0; + from_idx = (from_y0 + row) * MAX_X + from_x0; to_idx = (to_y + row) * hp->w + to_x; memcpy(&hp->vptr[to_idx], &screen[from_idx], width); } diff --git a/os_win32/Moon.ico b/os_win32/Moon.ico new file mode 100644 index 0000000..7e75e8d Binary files /dev/null and b/os_win32/Moon.ico differ diff --git a/os_win32/Shuttle.ico b/os_win32/Shuttle.ico deleted file mode 100644 index fb4d972..0000000 Binary files a/os_win32/Shuttle.ico and /dev/null differ diff --git a/os_win32/installer.nsi.in b/os_win32/installer.nsi.in index 9c29f5a..10e2aeb 100644 --- a/os_win32/installer.nsi.in +++ b/os_win32/installer.nsi.in @@ -75,23 +75,24 @@ Section "Dummy Section" SecDummy File AUTHORS.txt File COPYING.txt ;Icon - File Shuttle.ico + File Moon.ico ;Data files File /r ${DATA_DIR}\audio File /r ${DATA_DIR}\video File /r ${DATA_DIR}\gamedata + File /r ${DATA_DIR}\images CreateShortCut "$INSTDIR\${PTARNAME}.lnk" \ "$INSTDIR\${PTARNAME}.exe" \ '"BARIS_DATA=$INSTDIR"' \ - "$INSTDIR\Shuttle.ico" \ + "$INSTDIR\Moon.ico" \ 0 \ SW_SHOWNORMAL CreateShortCut "$DESKTOP\${PNAME}.lnk" \ "$INSTDIR\${PTARNAME}.exe" \ '"BARIS_DATA=$INSTDIR"' \ - "$INSTDIR\Shuttle.ico" \ + "$INSTDIR\Moon.ico" \ 0 \ SW_SHOWNORMAL @@ -127,7 +128,7 @@ Section "Uninstall" Delete "$INSTDIR\*.dll" Delete "$INSTDIR\${PTARNAME}.exe" Delete "$INSTDIR\${PTARNAME}.lnk" - Delete "$INSTDIR\Shuttle.ico" + Delete "$INSTDIR\Moon.ico" ;SDL creates these, we don't want them to float around. Delete "$INSTDIR\stdout.txt" Delete "$INSTDIR\stderr.txt" diff --git a/raceintospace.spec.in b/raceintospace.spec.in index 6f07dfa..f5a482d 100644 --- a/raceintospace.spec.in +++ b/raceintospace.spec.in @@ -1,7 +1,7 @@ Name: @PACKAGE_TARNAME@ Version: @PACKAGE_VERSION@ Release: 1%{?dist} -Summary: A strategy game +Summary: A turn based space race strategy game Group: Games License: GPL @@ -10,7 +10,10 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -A strategy game for going to the moon +Open-source version of the Liftoff! board game by Fritz Bronner. It is +based on the code from original "BARIS" that was developed by Strategic +Visions and published by Interplay in as a disk based game in 1992 and a +cd-rom in 1994. %prep %setup -q diff --git a/version.c b/version.c index 490bc9f..1cd9fde 100644 --- a/version.c +++ b/version.c @@ -1,2 +1,2 @@ -169 +170