Changeset 71:1c5d40e597d9

Timestamp:

11/22/07 01:25:01 (3 years ago)

Author:

mdoison

Branch:

madcat

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/branches/madcat@93

Message:

• Applied rank.patch (tjw 1.2)
• Applied buildfire_opt.patch (tjw 1.2)
• Applied nova_in_sendserver.patch (tjw 1.2)

Location:

src/game

Files:

• g_cmds.c (modified) (2 diffs)
• g_main.c (modified) (2 diffs)
• g_weapon.c (modified) (4 diffs)

src/game/g_cmds.c

@@ -1740 +1740 @@
           ( ent->client->ps.stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING ) )
       {
-        trap_SendServerCommand( ent-g_entities, va( "print \"You cannot evolve while wallwalking\n\"" ) );
+        trap_SendServerCommand( ent-g_entities, "print \"You cannot evolve while wallwalking\n\"" );
         return;
       }
@@ -1813 +1813 @@
         {
           trap_SendServerCommand( ent-g_entities,
-               va( "print \"You cannot evolve from your current class\n\"" ) );
+               "print \"You cannot evolve from your current class\n\"" );
           return;
         }

src/game/g_main.c

@@ -1430 +1430 @@
 {
   int       i;
-  int       rank;
-  int       score;
-  int       newScore;
-  gclient_t *cl;
   char      P[ MAX_CLIENTS + 1 ] = {""};
   int       ff = 0;
@@ -1497 +1493 @@
   qsort( level.sortedClients, level.numConnectedClients,
     sizeof( level.sortedClients[ 0 ] ), SortRanks );
-
-  // set the rank value for all clients that are connected and not spectators
-  rank = -1;
-  score = 0;
-  for( i = 0;  i < level.numPlayingClients; i++ )
-  {
-    cl = &level.clients[ level.sortedClients[ i ] ];
-    newScore = cl->ps.persistant[ PERS_SCORE ];
-
-    if( i == 0 || newScore != score )
-    {
-      rank = i;
-      // assume we aren't tied until the next client is checked
-      level.clients[ level.sortedClients[ i ] ].ps.persistant[ PERS_RANK ] = rank;
-    }
-    else
-    {
-      // we are tied with the previous client
-      level.clients[ level.sortedClients[ i - 1 ] ].ps.persistant[ PERS_RANK ] = rank;
-      level.clients[ level.sortedClients[ i ] ].ps.persistant[ PERS_RANK ] = rank;
-    }
-
-    score = newScore;
-  }
 
   // see if it is time to end the level

src/game/g_weapon.c

@@ -750 +750 @@
 void buildFire( gentity_t *ent, dynMenu_t menu )
 {
-  if( ( ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) > BA_NONE )
+  buildable_t buildable = ( ent->client->ps.stats[ STAT_BUILDABLE ]
+                            & ~SB_VALID_TOGGLEBIT );
+
+  if( buildable > BA_NONE )
   {
     if( ent->client->ps.stats[ STAT_MISC ] > 0 )
@@ -758 +761 @@
     }
 
-    if( G_BuildIfValid( ent, ent->client->ps.stats[ STAT_BUILDABLE ] & ~SB_VALID_TOGGLEBIT ) )
+    if( G_BuildIfValid( ent, buildable ) )
     {
       if( g_cheats.integer || g_fastBuild.integer)
@@ -764 +767 @@
         ent->client->ps.stats[ STAT_MISC ] = 0;
       }
+/*
       else if( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && !G_IsOvermindBuilt( ) )
       {
@@ -775 +779 @@
           BG_FindBuildDelayForWeapon( ent->s.weapon ) * 2;
       }
+*/
       else
         ent->client->ps.stats[ STAT_MISC ] +=
-          BG_FindBuildDelayForWeapon( ent->s.weapon );
+          BG_FindBuildTimeForBuildable( buildable );
 
       ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;