rpms/rott/devel rott-1.1-fix-end-level-display.patch, NONE, 1.1 rott-1.1-gameover.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rott.spec, 1.5, 1.6 sources, 1.2, 1.3 rott-1.0-64bit.patch, 1.2, NONE rott-1.0-compile.patch, 1.1, NONE rott-1.0-cvs-fixes.patch, 1.1, NONE rott-1.0-debian.patch, 1.1, NONE rott-1.0-fixes.patch, 1.1, NONE rott-1.0-more-fixes.patch, 1.2, NONE rott-1.0-registered.patch, 1.1, NONE rott-1.0-winrott-fixes.patch, 1.1, NONE rott-1.0-winrott.patch, 1.1, NONE rott.6, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Aug 4 22:13:39 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/rott/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656
Modified Files:
.cvsignore rott.spec sources
Added Files:
rott-1.1-fix-end-level-display.patch rott-1.1-gameover.patch
Removed Files:
rott-1.0-64bit.patch rott-1.0-compile.patch
rott-1.0-cvs-fixes.patch rott-1.0-debian.patch
rott-1.0-fixes.patch rott-1.0-more-fixes.patch
rott-1.0-registered.patch rott-1.0-winrott-fixes.patch
rott-1.0-winrott.patch rott.6
Log Message:
* Mon Aug 4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-1
- New upstream release 1.1 (incorperating all our patches!)
rott-1.1-fix-end-level-display.patch:
--- NEW FILE rott-1.1-fix-end-level-display.patch ---
diff -up rott-1.1/rott/rt_game.c~ rott-1.1/rott/rt_game.c
--- rott-1.1/rott/rt_game.c~ 2008-08-04 23:36:53.000000000 +0200
+++ rott-1.1/rott/rt_game.c 2008-08-04 23:36:53.000000000 +0200
@@ -3426,7 +3426,7 @@ void LevelCompleted
tmpPic = ( pic_t * )W_CacheLumpName( "mmbk", PU_CACHE, Cvt_pic_t, 1 );
VWB_DrawPic( 0, 0, tmpPic );
VW_UpdateScreen();
- DisableScreenStretch();
+// DisableScreenStretch();
IN_StartAck();
EndBonusVoice = 0;
@@ -3759,7 +3759,7 @@ EndBonusSkip = true;
//bna section
- EnableScreenStretch();//bna++
+// EnableScreenStretch();//bna++
VW_UpdateScreen();//bna++
// DisableScreenStretch();//bna++
//bna section end
rott-1.1-gameover.patch:
--- NEW FILE rott-1.1-gameover.patch ---
--- rott-1.1/rott/rt_vid.c 2008-05-24 08:29:59.000000000 +0200
+++ rott-1.1.new/rott/rt_vid.c 2008-08-04 23:02:04.000000000 +0200
@@ -1099,38 +1100,23 @@
void VL_DecompressLBM (lbm_t *lbminfo, boolean flip)
{
- byte *screen = (byte *)bufferofs;
- byte *orig;
- int count;
- byte b,
- rept;
+ int count;
+ byte b, rept;
byte *source = (byte *)&lbminfo->data;
byte *buf;
int ht = lbminfo->height;
-
- int x = 0;
- int y;
- byte *origbuf;
byte pal[768];
-
-
- orig = screen;
-
- if (iGLOBAL_SCREENWIDTH <= 320){
- buf = (byte *) SafeMalloc (64000);
- }else{
- buf = (byte *) SafeMalloc (iGLOBAL_SCREENWIDTH*iGLOBAL_SCREENHEIGHT);
- }
- origbuf = buf;
-
- VL_ClearBuffer (displayofs, 0);
-
+
+ EnableScreenStretch();
+
memcpy(&pal[0],lbminfo->palette,768);
VL_NormalizePalette (&pal[0]);
VW_MarkUpdateBlock (0, 0, 320, 200);
+ buf = (byte *)bufferofs;
+
while (ht--)
{
count = 0;
@@ -1163,36 +1149,7 @@
buf += (iGLOBAL_SCREENWIDTH-320); //eg 800 - 320)
}
}
- //SetTextMode ( ); //12345678
-
- {
- int cnt;
-
- cnt = 0;
- screen = orig;
- buf = origbuf;
- VGAMAPMASK (writemask);
-
- //bna section start
- if (iGLOBAL_SCREENWIDTH <= 320){
- for (y = 0; y < (lbminfo->height*lbminfo->width); y++)
-
- {
- *screen++ = *(buf+y);
- }
- }else{
- for (y = 0; y < (lbminfo->height); y++){
- for (x = 0; x < iGLOBAL_SCREENWIDTH; x++){
- *screen++ = *(buf++);
- }
- }
- }
- // bna section end
-
- }
- SafeFree(origbuf);
- EnableScreenStretch();//bna++ shut on streech mode
if (flip==true)
VW_UpdateScreen ();
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 May 2007 15:30:06 -0000 1.2
+++ .cvsignore 4 Aug 2008 22:13:08 -0000 1.3
@@ -1 +1 @@
-rott-1.0.tar.gz
+rott-1.1.tar.gz
Index: rott.spec
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/rott.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rott.spec 10 Apr 2008 14:40:05 -0000 1.5
+++ rott.spec 4 Aug 2008 22:13:09 -0000 1.6
@@ -1,11 +1,11 @@
Name: rott
-Version: 1.0
-Release: 6%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: Rise of the Triad
Group: Amusements/Games
License: GPLv2+
URL: http://icculus.org/rott/
-Source0: http://icculus.org/rott/releases/rott-1.0.tar.gz
+Source0: http://icculus.org/rott/releases/rott-1.1.tar.gz
Source1: rott-shareware.sh
Source2: rott-registered.sh
Source3: rott.autodlrc
@@ -15,15 +15,8 @@
# free datafiles. I believe this constitues fair-use. If anyone disagrees let
# me know and I'll remove it
Source6: rott.png
-Source7: rott.6
-Patch0: rott-1.0-cvs-fixes.patch
-Patch1: rott-1.0-compile.patch
-Patch2: rott-1.0-fixes.patch
-Patch3: rott-1.0-64bit.patch
-Patch4: rott-1.0-winrott.patch
-Patch5: rott-1.0-winrott-fixes.patch
-Patch6: rott-1.0-more-fixes.patch
-Patch7: rott-1.0-debian.patch
+Patch0: rott-1.1-gameover.patch
+Patch1: rott-1.1-fix-end-level-display.patch
# Note: this gets applied during build, not during prep!
Patch99: rott-1.0-registered.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,19 +65,9 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-iconv -f iso-8859-1 -t utf-8 readme.txt > readme.tmp
-touch -r readme.txt readme.tmp
-mv readme.tmp readme.txt
-cp -a %{SOURCE7} rott-shareware.6
-cp -a %{SOURCE7} rott-registered.6
+cp -a doc/rott.6 rott-shareware.6
+cp -a doc/rott.6 rott-registered.6
sed -i.orig 's/rott/rott-shareware/g' rott-shareware.6
sed -i.orig 's/rott/rott-registered/g' rott-registered.6
touch -r rott-shareware.6.orig rott-shareware.6
@@ -161,7 +144,7 @@
%files shareware
%defattr(-,root,root,-)
-%doc README gpl.txt readme.txt
+%doc README COPYING doc/*.txt
%{_bindir}/rott-shareware*
%{_mandir}/man6/%{name}-shareware.6*
%{_datadir}/%{name}
@@ -171,7 +154,7 @@
%files registered
%defattr(-,root,root,-)
-%doc README gpl.txt readme.txt
+%doc README COPYING doc/*.txt
%{_bindir}/rott-registered*
%{_mandir}/man6/%{name}-registered.6*
%{_datadir}/applications/fedora-%{name}-registered.desktop
@@ -179,6 +162,9 @@
%changelog
+* Mon Aug 4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-1
+- New upstream release 1.1 (incorperating all our patches!)
+
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-6
- Many fixes (and a manpage) ported over from debian
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 May 2007 15:30:06 -0000 1.2
+++ sources 4 Aug 2008 22:13:09 -0000 1.3
@@ -1 +1 @@
-c1c6cbecf00f2229cf2e0053334dcfc1 rott-1.0.tar.gz
+3e4940c364ecfae86375b7b1a77860d9 rott-1.1.tar.gz
--- rott-1.0-64bit.patch DELETED ---
--- rott-1.0-compile.patch DELETED ---
--- rott-1.0-cvs-fixes.patch DELETED ---
--- rott-1.0-debian.patch DELETED ---
--- rott-1.0-fixes.patch DELETED ---
--- rott-1.0-more-fixes.patch DELETED ---
--- rott-1.0-registered.patch DELETED ---
--- rott-1.0-winrott-fixes.patch DELETED ---
--- rott-1.0-winrott.patch DELETED ---
--- rott.6 DELETED ---
More information about the scm-commits
mailing list