diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-08-03 16:23:53 +0200 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-08-03 16:23:53 +0200 |
| commit | 6c6e29265cecb2d6432ec0f3058f6d2e4d1f0548 (patch) | |
| tree | 512ea8e6e8a7bec46da97a51dd9691833ff85b7b | |
| parent | c1fd71e9b17eda83d6dea92b01fd9e7692e70f61 (diff) | |
| download | zcatch-6c6e29265cecb2d6432ec0f3058f6d2e4d1f0548.tar.gz zcatch-6c6e29265cecb2d6432ec0f3058f6d2e4d1f0548.zip | |
Made amount of grenade-bullets adjustable
| -rw-r--r-- | src/game/server/entities/character.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gamecontext.h | 2 | ||||
| -rw-r--r-- | src/game/server/gamemodes/zcatch.cpp | 2 | ||||
| -rw-r--r-- | src/game/variables.h | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 47f5e9f4..ac5f2f7c 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -494,7 +494,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, (GameServer()->m_pController->IsZCatch()) ? 6 : 10); + m_aWeapons[m_ActiveWeapon].m_Ammo = min(m_aWeapons[m_ActiveWeapon].m_Ammo + 1, (GameServer()->m_pController->IsZCatch()) ? g_Config.m_SvGrenadeBullets : 10); m_aWeapons[m_ActiveWeapon].m_AmmoRegenStart = -1; } } diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h index 1d9e9d76..8dca1fbe 100644 --- a/src/game/server/gamecontext.h +++ b/src/game/server/gamecontext.h @@ -16,7 +16,7 @@ #include "player.h" #define MAX_MUTES 35 -#define ZCATCH_VERSION "0.4.6" +#define ZCATCH_VERSION "0.4.7 BETA" /* Tick diff --git a/src/game/server/gamemodes/zcatch.cpp b/src/game/server/gamemodes/zcatch.cpp index 9b364b38..bb36b8ae 100644 --- a/src/game/server/gamemodes/zcatch.cpp +++ b/src/game/server/gamemodes/zcatch.cpp @@ -182,7 +182,7 @@ void CGameController_zCatch::OnCharacterSpawn(class CCharacter *pChr) pChr->GiveWeapon(WEAPON_HAMMER, -1); break; case 4: /* Grenade */ - pChr->GiveWeapon(WEAPON_GRENADE, 6); + pChr->GiveWeapon(WEAPON_GRENADE, g_Config.m_SvGrenadeBullets); break; case 5: /* Ninja */ pChr->GiveNinja(); diff --git a/src/game/variables.h b/src/game/variables.h index da3d1b83..15a8e30f 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -110,6 +110,7 @@ MACRO_CONFIG_INT(SvAnticamperRange, sv_anticamper_range, 200, 0, 1000, CFGFLAG_S MACRO_CONFIG_INT(SvVoteForceReason, sv_vote_forcereason, 1, 0, 1, CFGFLAG_SERVER, "Allow only votes with a reason (except settings)") MACRO_CONFIG_INT(SvGrenadeMinDamage, sv_grenade_min_damage, 4, 1, 6, CFGFLAG_SERVER, "How much damage the grenade must do to kill the player (depends how far away it explodes)") +MACRO_CONFIG_INT(SvGrenadeBullets, sv_grenade_bullets, -1, -1, 10, CFGFLAG_SERVER, "Default amount of bullets for the grenade (-1 = endless ammo), otherwise it reloads after some time") MACRO_CONFIG_INT(SvSuicideTime, sv_suicide_time, 15, 0, 60, CFGFLAG_SERVER, "Minimum time between suicides. 0 to forbid suicides completely") MACRO_CONFIG_INT(SvKillPenalty, sv_kill_penalty, 5, 0, 50, CFGFLAG_SERVER, "The amount of points which the score will be decreased on each suicide") #endif |