* [gentoo-commits] gentoo-x86 commit in games-fps/alienarena/files: alienarena-20100504-fixups.patch
@ 2010-05-10 2:22 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-05-10 2:22 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/05/10 02:22:12
Added: alienarena-20100504-fixups.patch
Log:
upstream fixups patch
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.1 games-fps/alienarena/files/alienarena-20100504-fixups.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/alienarena/files/alienarena-20100504-fixups.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/alienarena/files/alienarena-20100504-fixups.patch?rev=1.1&content-type=text/plain
Index: alienarena-20100504-fixups.patch
===================================================================
diff -ru alienarena7_40.orig/source/client/cl_scrn.c alienarena7_40/source/client/cl_scrn.c
--- alienarena7_40.orig/source/client/cl_scrn.c 2010-03-20 17:18:58.000000000 -0400
+++ alienarena7_40/source/client/cl_scrn.c 2010-05-02 14:36:49.000000000 -0400
@@ -1306,7 +1306,7 @@
value = cl.frame.playerstate.stats[atoi(token)];
if (value >= MAX_IMAGES)
Com_Error (ERR_DROP, "Pic >= MAX_IMAGES");
- if (cl.configstrings[CS_IMAGES+value])
+ if( cl.configstrings[CS_IMAGES+value][0] )
{
SCR_AddDirtyPoint (x, y);
SCR_AddDirtyPoint (x+23*scale, y+23*scale);
diff -ru alienarena7_40.orig/source/game/p_weapon.c alienarena7_40/source/game/p_weapon.c
--- alienarena7_40.orig/source/game/p_weapon.c 2010-03-12 23:22:38.000000000 -0500
+++ alienarena7_40/source/game/p_weapon.c 2010-05-02 14:36:49.000000000 -0400
@@ -175,6 +175,21 @@
game = gi.cvar("game", "", 0);
+#ifdef DATADIR
+ if ( game && *game->string ) {
+ sprintf( name, DATADIR"/%s/%s", game->string, filename );
+ *file = fopen( name, "rb" );
+ if( *file )
+ return 1;
+ }
+ sprintf( name, "%s/%s/%s", DATADIR, GAMEVERSION, filename );
+ *file = fopen (name, "rb");
+ if( *file )
+ return 1;
+
+ return -1;
+#else
+
if (!*game->string) //if there is a gamedir try here first
sprintf (name, "%s/%s", GAMEVERSION, filename);
else
@@ -188,6 +203,7 @@
else
return 1;
+
if(!found) { //try basedir
sprintf (name, "%s/%s", GAMEVERSION, filename);
*file = fopen (name, "rb");
@@ -200,6 +216,8 @@
}
else
return -1;
+#endif
+
}
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-fps/alienarena/files: alienarena-20100504-fixups.patch
@ 2010-11-15 22:57 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-11-15 22:57 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/11/15 22:57:27
Removed: alienarena-20100504-fixups.patch
Log:
old
(Portage version: 2.1.8.3/cvs/Linux i686)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-15 22:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-15 22:57 [gentoo-commits] gentoo-x86 commit in games-fps/alienarena/files: alienarena-20100504-fixups.patch Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2010-05-10 2:22 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox