Updates to g_cmds.c

code/game/g_active.h

@@ -4,4 +4,6 @@
 
 void detpack_shot( gentity_t* self, gentity_t* inflictor, gentity_t* attacker, int32_t damage, int32_t meansOfDeath );
 
+qboolean PlaceDecoy(gentity_t *ent);
+
 #endif /* _G_ACTIVE_H */

code/game/g_client.h

@@ -153,4 +153,6 @@ void G_Client_AddScore( gentity_t* ent, int score );
  */
 void G_Client_CalculateRanks( qboolean fromExit );
 
+extern clInitStatus_t clientInitialStatus[MAX_CLIENTS];
+
 #endif /* _G_CLIENT_H */

code/game/g_cmds.h

@@ -8,18 +8,10 @@ void DragCheck( void );
 pclass_t ValueNameForClass ( char* s );
 void BroadcastClassChange( gclient_t *client, pclass_t oldPClass );
 
-/**
- * Concatenate all arguments for this string.
- *
- * \param start start from the given argument
- * \return String containing concatenated command arguments.
- */
-char* ConcatArgs( int start );
-
 /**
  * Request current scoreboard information.
  */
-void Cmd_Score_f (gentity_t* ent);
+void DeathmatchScoreboardMessage(gentity_t* ent);
 
 /**
  * If the client being followed leaves the game, or you just want to drop

code/game/g_combat.c

@@ -598,7 +598,7 @@ void G_Client_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, i
 			}
 		}
 
-		Cmd_Score_f( self );		// show scores
+		DeathmatchScoreboardMessage(self);		// show scores
 		// send updated scores to any clients that are following this one,
 		// or they would get stale scoreboards
 		for ( i = 0 ; i < level.maxclients ; i++ ) {
@@ -612,7 +612,7 @@ void G_Client_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, i
 				continue;
 			}
 			if ( client->sess.spectatorClient == self->s.number ) {
-				Cmd_Score_f( g_entities + i );
+				DeathmatchScoreboardMessage(g_entities + i);
 			}
 		}
 

code/game/g_spawn.h

@@ -482,5 +482,10 @@ qboolean G_SpawnVector4( const char* key, const char* defaultString, /*@out@*/ f
  */
 void G_SpawnEntitiesFromString( void );
 
+/**
+ * \brief Calls the spawn function for an entity.
+ */
+qboolean G_CallSpawn(gentity_t *ent);
+
 #endif /* _G_SPAWN_H */
 

code/game/lua_entity.c

@@ -3,8 +3,6 @@
 #include "g_lua.h"
 #include "g_spawn.h"
 
-extern qboolean G_CallSpawn(gentity_t *ent);
-
 #ifdef G_LUA
 
 /***