* s/G_TriggerMenu2/G_TriggerMenuArgs/

* s/ALIEN_CREDITS_PER_FRAG/ALIEN_CREDITS_PER_KILL/

5 files changed, 16 insertions, 16 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 3de02f9b..3d802878 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1214,7 +1214,7 @@ static const classAttributes_t bg_classList[ ] =
     1.0f,                                           //float   knockbackScale;
     { PCL_NONE, PCL_NONE, PCL_NONE },               //int     children[ 3 ];
     0,                                              //int     cost;
-    ALIEN_CREDITS_PER_FRAG                          //int     value;
+    ALIEN_CREDITS_PER_KILL                          //int     value;
   },
   {
     PCL_HUMAN_BSUIT,                                //int     classnum;
@@ -1241,7 +1241,7 @@ static const classAttributes_t bg_classList[ ] =
     1.0f,                                           //float   knockbackScale;
     { PCL_NONE, PCL_NONE, PCL_NONE },               //int     children[ 3 ];
     0,                                              //int     cost;
-    ALIEN_CREDITS_PER_FRAG                          //int     value;
+    ALIEN_CREDITS_PER_KILL                          //int     value;
   }
 };
 
@@ -1373,7 +1373,7 @@ int BG_ClassCanEvolveFromTo( class_t fclass,
           !BG_ClassIsAllowed( thruClass ) )
         continue;
 
-      evolveCost = BG_Class( thruClass )->cost * ALIEN_CREDITS_PER_FRAG;
+      evolveCost = BG_Class( thruClass )->cost * ALIEN_CREDITS_PER_KILL;
       if( thruClass == tclass )
         value = cost + evolveCost;
       else
@@ -1410,7 +1410,7 @@ qboolean BG_AlienCanEvolve( class_t class, int credits, int stage )
       tclass = bg_classList[ i ].children[ j ];
       if( tclass != PCL_NONE && BG_ClassAllowedInStage( tclass, stage ) &&
           BG_ClassIsAllowed( tclass ) &&
-          credits >= BG_Class( tclass )->cost * ALIEN_CREDITS_PER_FRAG )
+          credits >= BG_Class( tclass )->cost * ALIEN_CREDITS_PER_KILL )
         return qtrue;
     }
 
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 2bca3a27..ce96939c 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -367,7 +367,7 @@ void Cmd_Give_f( gentity_t *ent )
     int credits = atoi( name + 6 );
 
     if( ent->client->pers.teamSelection == TEAM_ALIENS )
-      credits *= ALIEN_CREDITS_PER_FRAG;
+      credits *= ALIEN_CREDITS_PER_KILL;
 
     if( give_all )
       credits = ALIEN_MAX_CREDITS;
@@ -1733,19 +1733,19 @@ void Cmd_Class_f( gentity_t *ent )
           newClass != PCL_ALIEN_BUILDER0_UPG &&
           newClass != PCL_ALIEN_LEVEL0 )
       {
-        G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTSPAWN, newClass );
+        G_TriggerMenuArgs( ent->client->ps.clientNum, MN_A_CLASSNOTSPAWN, newClass );
         return;
       }
 
       if( !BG_ClassIsAllowed( newClass ) )
       {
-        G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTALLOWED, newClass );
+        G_TriggerMenuArgs( ent->client->ps.clientNum, MN_A_CLASSNOTALLOWED, newClass );
         return;
       }
 
       if( !BG_ClassAllowedInStage( newClass, g_alienStage.integer ) )
       {
-        G_TriggerMenu2( ent->client->ps.clientNum, MN_A_CLASSNOTATSTAGE, newClass );
+        G_TriggerMenuArgs( ent->client->ps.clientNum, MN_A_CLASSNOTATSTAGE, newClass );
         return;
       }
 
@@ -1878,7 +1878,7 @@ void Cmd_Class_f( gentity_t *ent )
           }
         }
         else
-          G_TriggerMenu2( clientNum, MN_A_CANTEVOLVE, newClass );
+          G_TriggerMenuArgs( clientNum, MN_A_CANTEVOLVE, newClass );
       }
       else
         G_TriggerMenu( clientNum, MN_A_NOEROOM );
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 2068e5a6..d9eca24a 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -791,7 +791,7 @@ const char  *BuildShaderStateConfig( void );
 qboolean    G_ClientIsLagging( gclient_t *client );
 
 void        G_TriggerMenu( int clientNum, dynMenu_t menu );
-void        G_TriggerMenu2( int clientNum, dynMenu_t menu, int arg );
+void        G_TriggerMenuArgs( int clientNum, dynMenu_t menu, int arg );
 void        G_CloseMenus( int clientNum );
 
 qboolean    G_Visible( gentity_t *ent1, gentity_t *ent2, int contents );
diff --git a/src/game/g_utils.c b/src/game/g_utils.c
index 0cab96a1..62fcc2a4 100644
--- a/src/game/g_utils.c
+++ b/src/game/g_utils.c
@@ -830,12 +830,12 @@ void G_TriggerMenu( int clientNum, dynMenu_t menu )
 
 /*
 ===============
-G_TriggerMenu2
+G_TriggerMenuArgs
 
 Trigger a menu on some client and passes an argument
 ===============
 */
-void G_TriggerMenu2( int clientNum, dynMenu_t menu, int arg )
+void G_TriggerMenuArgs( int clientNum, dynMenu_t menu, int arg )
 {
   char buffer[ 64 ];
 
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index c6666b50..45a64979 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -350,8 +350,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ALIEN_REGEN_NOCREEP_MOD     (1.0f/3.0f) //regen off creep
 
 #define ALIEN_MAX_FRAGS             9
-#define ALIEN_MAX_CREDITS           (ALIEN_MAX_FRAGS*ALIEN_CREDITS_PER_FRAG)
-#define ALIEN_CREDITS_PER_FRAG      400
+#define ALIEN_MAX_CREDITS           (ALIEN_MAX_FRAGS*ALIEN_CREDITS_PER_KILL)
+#define ALIEN_CREDITS_PER_KILL      400
 #define ALIEN_TK_SUICIDE_PENALTY    350
 
 /*
@@ -531,7 +531,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define HUMAN_BHLTH_MODIFIER        1.0f
 #define HBHM(h)                     ((int)((float)h*HUMAN_BHLTH_MODIFIER))
 #define HUMAN_BVALUE_MODIFIER       240.0f
-#define HBVM(h)                     ((int)((float)h*(float)HUMAN_BVALUE_MODIFIER)) // remember these are measured in credits not frags (c.f. ALIEN_CREDITS_PER_FRAG)
+#define HBVM(h)                     ((int)((float)h*(float)HUMAN_BVALUE_MODIFIER)) // remember these are measured in credits not frags (c.f. ALIEN_CREDITS_PER_KILL)
 
 #define REACTOR_BASESIZE            1000
 #define REPEATER_BASESIZE           500
@@ -656,7 +656,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define AVG_FALL_DISTANCE           ((MIN_FALL_DISTANCE+MAX_FALL_DISTANCE)/2.0f)
 
 #define FREEKILL_PERIOD             120000 //msec
-#define FREEKILL_ALIEN              ALIEN_CREDITS_PER_FRAG
+#define FREEKILL_ALIEN              ALIEN_CREDITS_PER_KILL
 #define FREEKILL_HUMAN              LEVEL0_VALUE
 
 #define DEFAULT_ALIEN_BUILDPOINTS   "100"