Removed a debug message and did some cleanups

This commit is contained in:
Richard Allen 2002-04-23 11:24:06 +00:00
parent 33e04e8ed6
commit 02135f4c82
2 changed files with 61 additions and 67 deletions

View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.23 2002/04/23 11:24:06 jbravo
// Removed a debug message and did some cleanups
//
// Revision 1.22 2002/04/22 02:27:57 jbravo // Revision 1.22 2002/04/22 02:27:57 jbravo
// Dynamic model recognition // Dynamic model recognition
// //
@ -487,7 +490,6 @@ CG_RegisterClientSkin
static qboolean CG_RegisterClientSkin( clientInfo_t *ci, const char *teamName, const char *modelName, const char *skinName, const char *headModelName, const char *headSkinName ) { static qboolean CG_RegisterClientSkin( clientInfo_t *ci, const char *teamName, const char *modelName, const char *skinName, const char *headModelName, const char *headSkinName ) {
char filename[MAX_QPATH]; char filename[MAX_QPATH];
CG_Printf("debug: modelName = %s, skinName = %s, headModelName = %s, headSkinName = %s\n", modelName, skinName, headModelName, headSkinName);
/* /*
Com_sprintf( filename, sizeof( filename ), "models/players/%s/%slower_%s.skin", modelName, teamName, skinName ); Com_sprintf( filename, sizeof( filename ), "models/players/%s/%slower_%s.skin", modelName, teamName, skinName );
ci->legsSkin = trap_R_RegisterSkin( filename ); ci->legsSkin = trap_R_RegisterSkin( filename );

View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.64 2002/04/23 11:24:06 jbravo
// Removed a debug message and did some cleanups
//
// Revision 1.63 2002/04/13 15:37:54 jbravo // Revision 1.63 2002/04/13 15:37:54 jbravo
// limchasecam has been redone with new spec system // limchasecam has been redone with new spec system
// //
@ -227,8 +230,7 @@ void AddIP(char *str);
void CheckTeamRules() void CheckTeamRules()
{ {
int winner, i; int winner, i, checked_tie = 0;
int checked_tie = 0;
gentity_t *player; gentity_t *player;
//Slicer //Slicer
@ -266,8 +268,7 @@ void CheckTeamRules()
trap_SendServerCommand( -1, "cp \"Not enough players to play!\n\""); trap_SendServerCommand( -1, "cp \"Not enough players to play!\n\"");
else else
trap_SendServerCommand( -1, "cp \"Both Teams Must Be Ready!\n\""); trap_SendServerCommand( -1, "cp \"Both Teams Must Be Ready!\n\"");
} } else
else
trap_SendServerCommand( -1, "cp \"Not enough players to play!\n\""); trap_SendServerCommand( -1, "cp \"Not enough players to play!\n\"");
MakeAllLivePlayersObservers(); MakeAllLivePlayersObservers();
@ -339,7 +340,6 @@ void CheckTeamRules()
level.lights_camera_action = 0; level.lights_camera_action = 0;
level.holding_on_tie_check = 0; level.holding_on_tie_check = 0;
level.team_round_countdown = (71*level.fps)/10; level.team_round_countdown = (71*level.fps)/10;
// trap_SendConsoleCommand( EXEC_APPEND, "map_restart 0\n" );
return; return;
} }
@ -353,7 +353,6 @@ void CheckTeamRules()
level.lights_camera_action = 0; level.lights_camera_action = 0;
level.holding_on_tie_check = 0; level.holding_on_tie_check = 0;
level.team_round_countdown = (71*level.fps)/10; level.team_round_countdown = (71*level.fps)/10;
// trap_SendConsoleCommand( EXEC_APPEND, "map_restart 0\n" );
return; return;
} }
} }
@ -423,8 +422,7 @@ void CleanLevel()
ClearBodyQue(); ClearBodyQue();
ent = &g_entities[MAX_CLIENTS]; ent = &g_entities[MAX_CLIENTS];
for ( i = MAX_CLIENTS ; i<level.num_entities ; i++, ent++) for (i = MAX_CLIENTS ; i<level.num_entities ; i++, ent++) {
{
if (!ent->inuse) if (!ent->inuse)
continue; continue;
if (!ent->item) if (!ent->item)
@ -574,8 +572,7 @@ int WonGame(int winner)
MakeAllLivePlayersObservers (); MakeAllLivePlayersObservers ();
trap_SendServerCommand( -1, "cp \"Match is OVER !!!.\n\""); trap_SendServerCommand( -1, "cp \"Match is OVER !!!.\n\"");
return 1; return 1;
} } else {
else {
//Slicer: Adding a normal console print.. //Slicer: Adding a normal console print..
trap_SendServerCommand( -1, "print \"Roundlimit hit.\n\"" ); trap_SendServerCommand( -1, "print \"Roundlimit hit.\n\"" );
trap_SendServerCommand( -1, va("cp \"Roundlimit hit.\n\"")); trap_SendServerCommand( -1, va("cp \"Roundlimit hit.\n\""));
@ -587,14 +584,12 @@ int WonGame(int winner)
} }
} }
} }
return 0; return 0;
} }
team_t RQ3TeamCount( int ignoreClientNum, int team ) team_t RQ3TeamCount( int ignoreClientNum, int team )
{ {
int i; int i, count = 0;
int count = 0;
char buf[20]; char buf[20];
for (i=0; i<level.maxclients; i++) { for (i=0; i<level.maxclients; i++) {
@ -688,14 +683,11 @@ void SpawnPlayers()
client->sess.teamSpawn = qfalse; client->sess.teamSpawn = qfalse;
} }
//Blaze: May aswell respawn breakables here //Blaze: May aswell respawn breakables here
for (i=0;i<level.num_entities; i++) for (i=0; i<level.num_entities; i++) {
{
ent = &g_entities[i]; ent = &g_entities[i];
if (ent != NULL && ent->classname != NULL && !strcmp(ent->classname, "func_breakable")) if (ent != NULL && ent->classname != NULL && !strcmp(ent->classname, "func_breakable")) {
{
//re-link all unlinked breakables //re-link all unlinked breakables
trap_LinkEntity(ent); trap_LinkEntity(ent);
} }
} }
} }