diff options
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/character.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gamemodes/zcatch.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index a874debd..dc70641a 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -489,7 +489,7 @@ void CCharacter::HandleWeapons() if ((Server()->Tick() - m_aWeapons[m_ActiveWeapon].m_AmmoRegenStart) >= AmmoRegenTime * Server()->TickSpeed() / 1000) { // Add some ammo - m_aWeapons[m_ActiveWeapon].m_Ammo = min(m_aWeapons[m_ActiveWeapon].m_Ammo + 1, g_Config.m_SvGrenadeBullets); + m_aWeapons[m_ActiveWeapon].m_Ammo = min(m_aWeapons[m_ActiveWeapon].m_Ammo + 1, g_Config.m_SvWeaponsAmmo); m_aWeapons[m_ActiveWeapon].m_AmmoRegenStart = -1; } } diff --git a/src/game/server/gamemodes/zcatch.cpp b/src/game/server/gamemodes/zcatch.cpp index 42c241f9..4a810e04 100644 --- a/src/game/server/gamemodes/zcatch.cpp +++ b/src/game/server/gamemodes/zcatch.cpp @@ -174,16 +174,16 @@ void CGameController_zCatch::OnCharacterSpawn(class CCharacter *pChr) break; case 2: /* All Weapons */ pChr->GiveWeapon(WEAPON_HAMMER, -1); - pChr->GiveWeapon(WEAPON_GUN, 6); - pChr->GiveWeapon(WEAPON_GRENADE, 6); - pChr->GiveWeapon(WEAPON_SHOTGUN, 6); - pChr->GiveWeapon(WEAPON_RIFLE, 6); + pChr->GiveWeapon(WEAPON_GUN, g_Config.m_SvWeaponsAmmo); + pChr->GiveWeapon(WEAPON_GRENADE, g_Config.m_SvWeaponsAmmo); + pChr->GiveWeapon(WEAPON_SHOTGUN, g_Config.m_SvWeaponsAmmo); + pChr->GiveWeapon(WEAPON_RIFLE, g_Config.m_SvWeaponsAmmo); break; case 3: /* Hammer */ pChr->GiveWeapon(WEAPON_HAMMER, -1); break; case 4: /* Grenade */ - pChr->GiveWeapon(WEAPON_GRENADE, g_Config.m_SvGrenadeBullets); + pChr->GiveWeapon(WEAPON_GRENADE, g_Config.m_SvGrenadeEndlessAmmo ? -1 : g_Config.m_SvWeaponsAmmo); break; case 5: /* Ninja */ pChr->GiveNinja(); |