| 1 |
mr_bones_ 10/05/10 02:22:12 |
| 2 |
|
| 3 |
Added: alienarena-20100504-fixups.patch |
| 4 |
Log: |
| 5 |
upstream fixups patch |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-fps/alienarena/files/alienarena-20100504-fixups.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/alienarena/files/alienarena-20100504-fixups.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/alienarena/files/alienarena-20100504-fixups.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: alienarena-20100504-fixups.patch |
| 15 |
=================================================================== |
| 16 |
diff -ru alienarena7_40.orig/source/client/cl_scrn.c alienarena7_40/source/client/cl_scrn.c |
| 17 |
--- alienarena7_40.orig/source/client/cl_scrn.c 2010-03-20 17:18:58.000000000 -0400 |
| 18 |
+++ alienarena7_40/source/client/cl_scrn.c 2010-05-02 14:36:49.000000000 -0400 |
| 19 |
@@ -1306,7 +1306,7 @@ |
| 20 |
value = cl.frame.playerstate.stats[atoi(token)]; |
| 21 |
if (value >= MAX_IMAGES) |
| 22 |
Com_Error (ERR_DROP, "Pic >= MAX_IMAGES"); |
| 23 |
- if (cl.configstrings[CS_IMAGES+value]) |
| 24 |
+ if( cl.configstrings[CS_IMAGES+value][0] ) |
| 25 |
{ |
| 26 |
SCR_AddDirtyPoint (x, y); |
| 27 |
SCR_AddDirtyPoint (x+23*scale, y+23*scale); |
| 28 |
diff -ru alienarena7_40.orig/source/game/p_weapon.c alienarena7_40/source/game/p_weapon.c |
| 29 |
--- alienarena7_40.orig/source/game/p_weapon.c 2010-03-12 23:22:38.000000000 -0500 |
| 30 |
+++ alienarena7_40/source/game/p_weapon.c 2010-05-02 14:36:49.000000000 -0400 |
| 31 |
@@ -175,6 +175,21 @@ |
| 32 |
|
| 33 |
game = gi.cvar("game", "", 0); |
| 34 |
|
| 35 |
+#ifdef DATADIR |
| 36 |
+ if ( game && *game->string ) { |
| 37 |
+ sprintf( name, DATADIR"/%s/%s", game->string, filename ); |
| 38 |
+ *file = fopen( name, "rb" ); |
| 39 |
+ if( *file ) |
| 40 |
+ return 1; |
| 41 |
+ } |
| 42 |
+ sprintf( name, "%s/%s/%s", DATADIR, GAMEVERSION, filename ); |
| 43 |
+ *file = fopen (name, "rb"); |
| 44 |
+ if( *file ) |
| 45 |
+ return 1; |
| 46 |
+ |
| 47 |
+ return -1; |
| 48 |
+#else |
| 49 |
+ |
| 50 |
if (!*game->string) //if there is a gamedir try here first |
| 51 |
sprintf (name, "%s/%s", GAMEVERSION, filename); |
| 52 |
else |
| 53 |
@@ -188,6 +203,7 @@ |
| 54 |
else |
| 55 |
return 1; |
| 56 |
|
| 57 |
+ |
| 58 |
if(!found) { //try basedir |
| 59 |
sprintf (name, "%s/%s", GAMEVERSION, filename); |
| 60 |
*file = fopen (name, "rb"); |
| 61 |
@@ -200,6 +216,8 @@ |
| 62 |
} |
| 63 |
else |
| 64 |
return -1; |
| 65 |
+#endif |
| 66 |
+ |
| 67 |
} |
| 68 |
|
| 69 |
/* |
Archives