Skip to content
Permalink
Browse files

cgame: renamed internal variables for consistency

  • Loading branch information...
rmarquis committed Aug 9, 2019
1 parent 990f573 commit 3c480ade3c45291c205719bddc15aaedcc828d98
Showing with 8 additions and 8 deletions.
  1. +2 −2 src/cgame/cg_consolecmds.c
  2. +2 −2 src/cgame/cg_limbopanel.c
  3. +2 −2 src/cgame/cg_local.h
  4. +2 −2 src/cgame/cg_servercmds.c
@@ -1338,15 +1338,15 @@ qboolean CG_IsWeaponDisabled(weapon_t weapon)

if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_PANZER)
{
maxCount = cg.maxPanzers;
maxCount = cg.maxRockets;
}
else if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_MORTAR)
{
maxCount = cg.maxMortars;
}
else if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_MG)
{
maxCount = cg.maxMg42s;
maxCount = cg.maxMachineguns;
}
else if (GetWeaponTableData(GetWeaponTableData(weapon)->weapAlts)->type & WEAPON_TYPE_RIFLENADE)
{
@@ -3808,15 +3808,15 @@ qboolean CG_LimboPanel_RealWeaponIsDisabled(weapon_t weapon)

if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_PANZER)
{
maxCount = cg.maxPanzers;
maxCount = cg.maxRockets;
}
else if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_MORTAR)
{
maxCount = cg.maxMortars;
}
else if (GetWeaponTableData(weapon)->type & WEAPON_TYPE_MG)
{
maxCount = cg.maxMg42s;
maxCount = cg.maxMachineguns;
}
else if (GetWeaponTableData(GetWeaponTableData(weapon)->weapAlts)->type & WEAPON_TYPE_RIFLENADE)
{
@@ -1294,8 +1294,8 @@ typedef struct

char maxMortars[MAX_QPATH];
char maxFlamers[MAX_QPATH];
char maxMg42s[MAX_QPATH];
char maxPanzers[MAX_QPATH];
char maxMachineguns[MAX_QPATH];
char maxRockets[MAX_QPATH];
char maxRiflegrenades[MAX_QPATH];
int maxPlayers;

@@ -848,8 +848,8 @@ void CG_TeamRestrictionsChanged(void)

Q_strncpyz(cg.maxMortars, Info_ValueForKey(info, "w0"), sizeof(cg.maxMortars));
Q_strncpyz(cg.maxFlamers, Info_ValueForKey(info, "w1"), sizeof(cg.maxFlamers));
Q_strncpyz(cg.maxMg42s, Info_ValueForKey(info, "w2"), sizeof(cg.maxMg42s));
Q_strncpyz(cg.maxPanzers, Info_ValueForKey(info, "w3"), sizeof(cg.maxPanzers));
Q_strncpyz(cg.maxMachineguns, Info_ValueForKey(info, "w2"), sizeof(cg.maxMachineguns));
Q_strncpyz(cg.maxRockets, Info_ValueForKey(info, "w3"), sizeof(cg.maxRockets));
Q_strncpyz(cg.maxRiflegrenades, Info_ValueForKey(info, "w4"), sizeof(cg.maxRiflegrenades));
cg.maxPlayers = atoi(Info_ValueForKey(info, "m"));
}

0 comments on commit 3c480ad

Please sign in to comment.
You can’t perform that action at this time.