* Added trap_FS_GetFileList to cgame, so it's not longer necessary to hack

  around it not being there
* Removed Q3 console notify code and improved cgame rendered notify area
* Sorted out pain blend texture coordinates

2 files changed, 1 insertions, 37 deletions

diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 883d1a54..2b713951 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -83,9 +83,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define CS_PLAYERS          (CS_PARTICLE_SYSTEMS+MAX_GAME_PARTICLE_SYSTEMS)
 #define CS_PRECACHES        (CS_PLAYERS+MAX_CLIENTS)
 #define CS_LOCATIONS        (CS_PRECACHES+MAX_CLIENTS)
-#define CS_PARTICLE_FILES   (CS_LOCATIONS+MAX_LOCATIONS)
 
-#define CS_MAX              (CS_PARTICLE_FILES+MAX_PARTICLE_FILES)
+#define CS_MAX              (CS_LOCATIONS+MAX_LOCATIONS)
 
 #if (CS_MAX) > MAX_CONFIGSTRINGS
 #error overflow: (CS_MAX) > MAX_CONFIGSTRINGS
diff --git a/src/game/g_main.c b/src/game/g_main.c
index d1dbb845..bc3513a5 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -269,18 +269,11 @@ void QDECL G_Printf( const char *fmt, ... )
 {
   va_list argptr;
   char    text[ 1024 ];
-  char    clientText[ 1048 ];
 
   va_start( argptr, fmt );
   vsprintf( text, fmt, argptr );
   va_end( argptr );
 
-  if( !g_dedicated.integer )
-  {
-    Com_sprintf( clientText, 1048, "gprintf \"%s\"", text );
-    G_SendCommandFromServer( -1, clientText );
-  }
-
   trap_Printf( text );
 }
 
@@ -434,33 +427,6 @@ void G_UpdateCvars( void )
 }
 
 
-/*
-===============
-G_GenerateParticleFileList
-
-Make a list of particle files for each client to parse since fsr
-the client does not have trap_FS_GetFileList
-===============
-*/
-static void G_GenerateParticleFileList( void )
-{
-  int   i, numFiles, fileLen;
-  char  fileList[ MAX_PARTICLE_FILES * MAX_QPATH ];
-  char  fileName[ MAX_QPATH ];
-  char  *filePtr;
-
-  numFiles = trap_FS_GetFileList( "scripts", ".particle", fileList, MAX_PARTICLE_FILES * MAX_QPATH );
-  filePtr = fileList;
-
-  for( i = 0; i < numFiles; i++, filePtr += fileLen + 1 )
-  {
-    fileLen = strlen( filePtr );
-    strcpy( fileName, "scripts/" );
-    strcat( fileName, filePtr );
-    trap_SetConfigstring( CS_PARTICLE_FILES + i, fileName );
-  }
-}
-
 typedef struct gameElements_s
 {
   buildable_t       buildables[ BA_NUM_BUILDABLES ];
@@ -655,7 +621,6 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
   BG_InitClassOverrides( );
   BG_InitBuildableOverrides( );
   G_InitDamageLocations( );
-  G_GenerateParticleFileList( );
   G_InitMapRotations( );
   G_InitSpawnQueue( &level.alienSpawnQueue );
   G_InitSpawnQueue( &level.humanSpawnQueue );