Fixed teamstatus some more (Issue 121)

Prevented walking past of GUID string (Issue 122)

Updated wiki/References.wiki

Makefile

@@ -24,7 +24,7 @@ endif
 BUILD_CLIENT     = 0
 BUILD_CLIENT_SMP = 0
 BUILD_SERVER     = 0
-BUILD_GAME_SO    = 0
+BUILD_GAME_SO    = 1
 BUILD_GAME_QVM   = 1
 
 #############################################################################

src/game/g_admin.c

@@ -1281,7 +1281,7 @@ static int admin_listadmins( gentity_t *ent, int start, char *search, int minlev
     if( !strstr( name, search ) )
       continue;
 
-    for( j = 0; j <= 8; j++ )
+    for( j = 0; j < 8; j++ )
       guid_stub[ j ] = vic->client->pers.guid[ j + 24 ];
     guid_stub[ j ] = '\0';
   
@@ -1339,7 +1339,7 @@ static int admin_listadmins( gentity_t *ent, int start, char *search, int minlev
        if( dup )
          continue;
      }
-     for( j = 0; j <= 8; j++ )
+     for( j = 0; j < 8; j++ )
        guid_stub[ j ] = g_admin_admins[ i ]->guid[ j + 24 ];
      guid_stub[ j ] = '\0';
     
@@ -2486,7 +2486,7 @@ qboolean G_admin_ban( gentity_t *ent, int skiparg )
     ADMBP( "^3!ban: ^7multiple recent clients match name, use IP or slot#:\n" );
     for( i = 0; i < MAX_ADMIN_NAMELOGS && g_admin_namelog[ i ]; i++ )
     {
-      for( j = 0; j <= 8; j++ )
+      for( j = 0; j < 8; j++ )
         guid_stub[ j ] = g_admin_namelog[ i ]->guid[ j + 24 ];
       guid_stub[ j ] = '\0';
       for( j = 0; j < MAX_ADMIN_NAMELOG_NAMES
@@ -3370,7 +3370,7 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
       continue;
     }
 
-    for( j = 0; j <= 8; j++ )
+    for( j = 0; j < 8; j++ )
       guid_stub[ j ] = p->pers.guid[ j + 24 ];
     guid_stub[ j ] = '\0';
 
@@ -4302,7 +4302,7 @@ qboolean G_admin_namelog( gentity_t *ent, int skiparg )
         continue;
     }
     printed++;
-    for( j = 0; j <= 8; j++ )
+    for( j = 0; j < 8; j++ )
       guid_stub[ j ] = g_admin_namelog[ i ]->guid[ j + 24 ];
     guid_stub[ j ] = '\0';
     if( g_admin_namelog[ i ]->slot > -1 )

src/game/g_buildable.c

@@ -3397,7 +3397,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori
   built->spawnBlockTime = 0;
 
   // build instantly in cheat mode
-  if( builder->client && g_cheats.integer || g_instantBuild.integer )
+  if(( builder->client && g_cheats.integer ) || g_instantBuild.integer )
   {
     built->health = BG_FindHealthForBuildable( buildable );
     built->buildTime = built->s.time =

src/game/g_cmds.c

@@ -4080,9 +4080,9 @@ void Cmd_TeamStatus_f( gentity_t *ent )
  int i;
  int builders = 0;
  int arm = 0, medi = 0, boost = 0;
- char *omrc;
+ int omrc = 0;
+ qboolean omrcbuild = qfalse;
  gentity_t *tmp;
- qboolean found = qfalse;
  
  if( !g_teamStatus.integer )
  return;
@@ -4110,8 +4110,8 @@ void Cmd_TeamStatus_f( gentity_t *ent )
     if( tmp->s.eType != ET_BUILDABLE )
       continue;
     if( tmp->s.modelindex == BA_A_OVERMIND ){
-      omrc = va("^3OM: %s(%d)^3", ( tmp->health <= 0 ) ? "^1Down" : "^2Up", (tmp->health * 100 / OVERMIND_HEALTH ) );
-      found = qtrue;
+      omrc = tmp->health;
+      omrcbuild = tmp->spawned;
       break;
       }
   }
@@ -4142,10 +4142,7 @@ void Cmd_TeamStatus_f( gentity_t *ent )
       }
   }
   
-    if( found == qfalse )
-    omrc = "^3OM: ^1Down(0)^3";
-    
-    G_Say( ent, NULL, SAY_TEAM, va("%s ^3Eggs: ^6%i^3 Builders: ^6%i^3 Boosters: ^6%i^7", omrc, level.numAlienSpawns, builders, boost ));
+    G_Say( ent, NULL, SAY_TEAM, va("^3OM: %s(%d) ^3Eggs: ^6%i^3 Builders: ^6%i^3 Boosters: ^6%i^7", ( omrc <= 0 ) ? "^1Down" : ( omrcbuild ) ? "^2Up" : "^5Building", ( omrc > 0 ) ? omrc * 100 / OVERMIND_HEALTH : 0, level.numAlienSpawns, builders, boost ));
  }
  
  if( ent->client->pers.teamSelection == PTE_HUMANS ){
@@ -4156,8 +4153,8 @@ void Cmd_TeamStatus_f( gentity_t *ent )
     if( tmp->s.eType != ET_BUILDABLE )
       continue;
     if( tmp->s.modelindex == BA_H_REACTOR ){
-      omrc = va("^3RC: %s(%d)^3", ( tmp->health <= 0 ) ? "^1Down" : "^2Up", (tmp->health * 100 / REACTOR_HEALTH ) );
-      found = qtrue;
+      omrc = tmp->health;
+      omrcbuild = tmp->spawned;
       break;
       }
   }
@@ -4197,10 +4194,9 @@ void Cmd_TeamStatus_f( gentity_t *ent )
       medi++;
       }
   }
-    if( found == qfalse )
-    omrc = "^3RC: ^1Down(0)^3";
-    
-    G_Say( ent, NULL, SAY_TEAM, va("%s ^3Telenodes: ^6%i^3 Builders: ^6%i^3 Armouries: ^6%i^3 Medistations: ^6%i^7", omrc, level.numHumanSpawns, builders, arm, medi ));
+
+    G_Say( ent, NULL, SAY_TEAM, va("^3RC: %s(%d) ^3Telenodes: ^6%i^3 Builders: ^6%i^3 Armouries: ^6%i^3 Medistations: ^6%i^7", ( omrc <= 0 ) ? "^1Down" : ( omrcbuild ) ? "^2Up" : "^5Building",
+     ( omrc > 0 ) ? omrc * 100 / REACTOR_HEALTH : 0, level.numHumanSpawns, builders, arm, medi ));
  }
  
  return;

src/game/g_main.c

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_local.h"
 
 #define QVM_VARIANT       "P-G-QVM"
-#define QVM_VERSION       "SVN r66"
+#define QVM_VERSION       "SVN r67"
 
 level_locals_t  level;