Added g_layoutVotePercent cvar, for setting percentages for layout votes.

Added g_proximityMinesPrice cvar, for setting price of mines

Layout now uses !restart instead of !map, to prevent client map reloads.

src/game/bg_misc.c

@@ -3754,13 +3754,13 @@ int   bg_numWeapons = sizeof( bg_weapons ) / sizeof( bg_weapons[ 0 ] );
 BG_UpdateWeaponData
 ==============
 */
-void BG_UpdateWeaponData(int proximityMine) {
+void BG_UpdateWeaponData(int proximityMine, int price) {
 	int i;
 	
 	for(i=0; i<bg_numWeapons; i++) {
 		if(bg_weapons[i].weaponNum == WP_GRENADE) {
 			if(proximityMine) {
-				bg_weapons[i].price = PROXIMITY_PRICE;
+				bg_weapons[i].price = price;
 			} else {
 				bg_weapons[i].price = GRENADE_PRICE;
 			}
@@ -4317,13 +4317,13 @@ int   bg_numUpgrades = sizeof( bg_upgrades ) / sizeof( bg_upgrades[ 0 ] );
 BG_UpdateUpgradeData
 ==============
 */
-void BG_UpdateUpgradeData(int proximityMine) {
+void BG_UpdateUpgradeData(int proximityMine, int price) {
 	int i;
 	
 	for(i=0; i<bg_numUpgrades; i++) {
 		if(bg_upgrades[i].upgradeNum == UP_GRENADE) {
 			if(proximityMine) {
-				bg_upgrades[i].price = PROXIMITY_PRICE;
+				bg_upgrades[i].price = price;
 			} else {
 				bg_upgrades[i].price = GRENADE_PRICE;
 			}

src/game/g_cmds.c

@@ -1466,7 +1466,7 @@ void Cmd_CallVote_f( gentity_t *ent )
     {
       G_admin_maplog_result( "m" );
     }
-    else if( !Q_stricmpn( level.voteString, "!map", 4 ) )
+    else if( !Q_stricmpn( level.voteString, "!restart", 8 ) )
     {
       G_admin_maplog_result( "l" );
     }
@@ -1661,7 +1661,7 @@ void Cmd_CallVote_f( gentity_t *ent )
       && (level.numPlayingClients > 0 && level.numConnectedClients>1) )
     {
        trap_SendServerCommand( ent-g_entities, va(
-         "print \"You cannot call for a mapchange after %d seconds\n\"",
+         "print \"You cannot call for a layout change after %d seconds\n\"",
          g_mapvoteMaxTime.integer ) );
        G_admin_adminlog_log( ent, "vote", NULL, 0, qfalse );
        return;
@@ -1676,10 +1676,10 @@ void Cmd_CallVote_f( gentity_t *ent )
       return;
     }
     
-    Com_sprintf( level.voteString, sizeof( level.voteString ), "!map %s %s", map, arg2 );
+    Com_sprintf( level.voteString, sizeof( level.voteString ), "!restart %s", arg2 );
     Com_sprintf( level.voteDisplayString,
-        sizeof( level.voteDisplayString ), "Change to map layout '%s'", arg2 );
-    level.votePercentToPass = g_mapVotesPercent.integer;
+        sizeof( level.voteDisplayString ), "Change to layout '%s'", arg2 );
+    level.votePercentToPass = g_layoutVotePercent.integer;
   }
   else if( !Q_stricmp( arg1, "draw" ) )
   {
@@ -2953,8 +2953,8 @@ void Cmd_Buy_f( gentity_t *ent )
   qboolean  buyingEnergyAmmo = qfalse;
   qboolean  hasEnergyWeapon = qfalse;
   
-  BG_UpdateWeaponData(g_proximityMines.integer);
-  BG_UpdateUpgradeData(g_proximityMines.integer);
+  BG_UpdateWeaponData(g_proximityMines.integer, g_proximityMinesPrice.integer);
+  BG_UpdateUpgradeData(g_proximityMines.integer, g_proximityMinesPrice.integer);
   
   for( i = UP_NONE; i < UP_NUM_UPGRADES; i++ )
   {

src/game/g_local.h

@@ -1256,6 +1256,7 @@ extern  vmCvar_t  g_motd;
 extern  vmCvar_t  g_warmup;
 extern  vmCvar_t  g_doWarmup;
 extern  vmCvar_t  g_proximityMines;
+extern  vmCvar_t  g_proximityMinesPrice;
 extern  vmCvar_t  g_blood;
 extern  vmCvar_t  g_allowVote;
 extern  vmCvar_t  g_voteLimit;
@@ -1265,6 +1266,7 @@ extern  vmCvar_t  g_extendVotesPercent;
 extern  vmCvar_t  g_extendVotesTime;
 extern  vmCvar_t  g_extendVotesCount;
 extern  vmCvar_t  g_mapVotesPercent;
+extern  vmCvar_t  g_layoutVotePercent;
 extern  vmCvar_t  g_designateVotes;
 extern  vmCvar_t  g_admitDefeatVotePercent;
 extern  vmCvar_t  g_teamAutoJoin;

src/game/g_main.c

@@ -73,6 +73,7 @@ vmCvar_t  g_synchronousClients;
 vmCvar_t  g_warmup;
 vmCvar_t  g_doWarmup;
 vmCvar_t  g_proximityMines;
+vmCvar_t  g_proximityMinesPrice;
 vmCvar_t  g_restarted;
 vmCvar_t  g_lockTeamsAtStart;
 vmCvar_t  g_logFile;
@@ -88,6 +89,7 @@ vmCvar_t  g_extendVotesPercent;
 vmCvar_t  g_extendVotesTime;
 vmCvar_t  g_extendVotesCount;
 vmCvar_t  g_mapVotesPercent;
+vmCvar_t  g_layoutVotePercent;
 vmCvar_t  g_designateVotes;
 vmCvar_t  g_admitDefeatVotePercent;
 vmCvar_t  g_teamAutoJoin;
@@ -266,6 +268,7 @@ static cvarTable_t   gameCvarTable[ ] =
   { &g_modWeaponReload, "g_modWeaponReload", "0", CVAR_ARCHIVE, 0, qfalse  },
   
   { &g_proximityMines, "g_proximityMines", "0", 0, 0, qtrue  },
+  { &g_proximityMinesPrice, "g_proximityMinesPrice", "800", 0, 0, qtrue  },
   { &g_teamAutoJoin, "g_teamAutoJoin", "0", CVAR_ARCHIVE  },
   { &g_teamForceBalance, "g_teamForceBalance", "1", CVAR_ARCHIVE  },
   { &g_buyAll, "g_buyAll", "0", CVAR_ARCHIVE, 0, qtrue  },
@@ -313,6 +316,7 @@ static cvarTable_t   gameCvarTable[ ] =
   { &g_extendVotesTime, "g_extendVotesTime", "10", CVAR_ARCHIVE, 0, qfalse },
   { &g_extendVotesCount, "g_extendVotesCount", "3", CVAR_ARCHIVE, 0, qfalse },
   { &g_mapVotesPercent, "g_mapVotesPercent", "50", CVAR_ARCHIVE, 0, qfalse },
+  { &g_layoutVotePercent, "g_layoutVotePercent", "50", CVAR_ARCHIVE, 0, qfalse },
   { &g_designateVotes, "g_designateVotes", "0", CVAR_ARCHIVE, 0, qfalse },
   { &g_admitDefeatVotePercent, "g_admitDefeatVotePercent", "50", CVAR_ARCHIVE, 0, qfalse },
   
@@ -2318,7 +2322,7 @@ void CheckVote( void )
     {
       G_admin_maplog_result( "m" );
     }
-    else if( !Q_stricmpn( level.voteString, "!map", 4 ) )
+    else if( !Q_stricmpn( level.voteString, "!restart", 8 ) )
     {
       G_admin_maplog_result( "l" );
     }

src/game/tremulous.h

@@ -375,7 +375,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PROXIMITY_RANGE				100
 #define PROXIMITY_CHECK_FREQUENCY	100
 #define	PROXIMITY_BOOM_TIME			20
-#define PROXIMITY_PRICE				800
+//Unused now because i(google) added a cvar to control this
+//#define PROXIMITY_PRICE				800
 
 #define SHOTGUN_PRICE               150
 #define SHOTGUN_SHELLS              8