Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use explicit constants when checking g_gametype

Browse source
This commit is contained in:
smallmodel 2024-11-22 19:44:53 +01:00
parent 04da76167c
commit e2f4d8cd6b
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
9 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/client/cl_ui.cpp
View file

@ -2676,7 +2676,7 @@ void UI_PushMenuSP_f(void)
}
if ((!com_cl_running || !com_cl_running->integer || clc.state == CA_DISCONNECTED || !cg_gametype->integer)
&& (!com_sv_running || !com_sv_running->integer || !g_gametype->integer)) {
&& (!com_sv_running || !com_sv_running->integer || g_gametype->integer == GT_SINGLE_PLAYER)) {
UI_PushMenu(Cmd_Argv(1));
}
}
@ -2697,7 +2697,7 @@ void UI_PushMenuMP_f(void)
}
if (com_cl_running && com_cl_running->integer && clc.state != CA_DISCONNECTED && cg_gametype->integer
&& com_sv_running && com_sv_running->integer && g_gametype->integer) {
&& com_sv_running && com_sv_running->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
cmd = Cmd_Argv(1);
//

6
code/fgame/entity.cpp
View file

@ -3596,7 +3596,7 @@ void Entity::Sound(
_tmp = true;
}
if (doCallback && g_gametype->integer) {
if (doCallback && g_gametype->integer != GT_SINGLE_PLAYER) {
Com_Printf("^~^~^ Callback of sound '%s' ignored.\n", sound_name.c_str());
doCallback = 0;
}
@ -5078,7 +5078,7 @@ void Entity::TouchTriggersEvent(Event *ev)
void Entity::DeathSinkStart(Event *ev)
{
if (g_gametype->integer) {
if (g_gametype->integer != GT_SINGLE_PLAYER) {
PostEvent(EV_Remove, 5.0f);
} else {
// Start the sinking
@ -5090,7 +5090,7 @@ void Entity::DeathSink(Event *ev)
{
// Sink just a little
if (g_gametype->integer) {
if (g_gametype->integer != GT_SINGLE_PLAYER) {
origin[2] -= 0.2f;
setOrigin(origin);

2
code/fgame/gibs.cpp
View file

@ -147,7 +147,7 @@ void Gib::Splat
)
{
if ( g_gametype->integer )
if ( g_gametype->integer != GT_SINGLE_PLAYER )
return;
if ( sprayed > 3 )

4
code/fgame/item.cpp
View file

@ -812,7 +812,7 @@ void Item::SetMaxAmount(Event *ev)
void Item::SetDMAmountEvent(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
setAmount(ev->GetInteger(1));
@ -820,7 +820,7 @@ void Item::SetDMAmountEvent(Event *ev)
void Item::SetDMMaxAmount(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
setAmount(ev->GetInteger(1));

4
code/fgame/scriptthread.cpp
View file

@ -5311,13 +5311,13 @@ void ScriptThread::TeamSetScore(Event *ev)
if (bAdd) {
team->m_iKills += score;
if (g_gametype->integer < 3) {
if (g_gametype->integer < GT_TEAM_ROUNDS) {
team->m_teamwins += score;
}
} else {
team->m_iKills = score;
if (g_gametype->integer < 3) {
if (g_gametype->integer < GT_TEAM_ROUNDS) {
team->m_teamwins = score;
}
}

2
code/fgame/trigger.cpp
View file

@ -1864,7 +1864,7 @@ void TriggerChangeLevel::ChangeLevel(Event *ev)
//
m_Thread.Execute();
if (g_gametype->integer) {
if (g_gametype->integer != GT_SINGLE_PLAYER) {
G_BeginIntermission2();
return;
}

50
code/fgame/weapon.cpp
View file

@ -1318,7 +1318,7 @@ void Weapon::SetUseNoAmmo(Event *ev)
//======================
void Weapon::SetStartAmmo(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -1331,7 +1331,7 @@ void Weapon::SetStartAmmo(Event *ev)
//======================
void Weapon::SetDMStartAmmo(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -1380,7 +1380,7 @@ float Weapon::GetMaxChargeTime(firemode_t mode)
//======================
void Weapon::SetAmmoRequired(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -1393,7 +1393,7 @@ void Weapon::SetAmmoRequired(Event *ev)
//======================
void Weapon::SetDMAmmoRequired(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -2775,7 +2775,7 @@ void Weapon::AttachToHand(Event *ev)
//======================
void Weapon::SetCantPartialReload(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -2787,7 +2787,7 @@ void Weapon::SetCantPartialReload(Event *ev)
//======================
void Weapon::SetDMCantPartialReload(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3594,7 +3594,7 @@ int Weapon::ClipAmmo(firemode_t mode)
//======================
void Weapon::SetFireDelay(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3606,7 +3606,7 @@ void Weapon::SetFireDelay(Event *ev)
//======================
void Weapon::SetDMFireDelay(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3687,7 +3687,7 @@ firemode_t Weapon::GetFireMode()
//======================
void Weapon::SetProjectile(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3701,7 +3701,7 @@ void Weapon::SetProjectile(Event *ev)
//======================
void Weapon::SetDMProjectile(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3740,7 +3740,7 @@ void Weapon::SetTracerSpeed(Event *ev)
//======================
void Weapon::SetDMBulletDamage(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3762,7 +3762,7 @@ void Weapon::SetBulletKnockback(Event *ev)
//======================
void Weapon::SetDMBulletKnockback(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3791,7 +3791,7 @@ void Weapon::SetBulletThroughMetal(Event *ev)
//======================
void Weapon::SetBulletRange(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3804,7 +3804,7 @@ void Weapon::SetBulletRange(Event *ev)
//======================
void Weapon::SetDMBulletRange(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3825,7 +3825,7 @@ void Weapon::SetRange(Event *ev)
//======================
void Weapon::SetBulletCount(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3838,7 +3838,7 @@ void Weapon::SetBulletCount(Event *ev)
//======================
void Weapon::SetDMBulletCount(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3851,7 +3851,7 @@ void Weapon::SetDMBulletCount(Event *ev)
//======================
void Weapon::SetBulletSpread(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3870,7 +3870,7 @@ void Weapon::SetBulletSpread(Event *ev)
//======================
void Weapon::SetDMBulletSpread(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3889,7 +3889,7 @@ void Weapon::SetDMBulletSpread(Event *ev)
//======================
void Weapon::SetZoomSpreadMult(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3901,7 +3901,7 @@ void Weapon::SetZoomSpreadMult(Event *ev)
//======================
void Weapon::SetDMZoomSpreadMult(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3914,7 +3914,7 @@ void Weapon::SetDMZoomSpreadMult(Event *ev)
//======================
void Weapon::SetFireSpreadMult(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -3930,7 +3930,7 @@ void Weapon::SetFireSpreadMult(Event *ev)
//======================
void Weapon::SetDMFireSpreadMult(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -3990,7 +3990,7 @@ void Weapon::Crosshair(Event *ev)
//====================
void Weapon::DMCrosshair(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}
@ -4295,7 +4295,7 @@ void Weapon::SetViewKick(Event *ev)
//======================
void Weapon::SetMovementSpeed(Event *ev)
{
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
return;
}
@ -4307,7 +4307,7 @@ void Weapon::SetMovementSpeed(Event *ev)
//======================
void Weapon::SetDMMovementSpeed(Event *ev)
{
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
return;
}

12
code/fgame/weaputils.cpp
View file

@ -1255,7 +1255,7 @@ void Projectile::Touch(Event *ev)
);
}
if (!g_gametype->integer && weap) {
if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
if (other->IsSubclassOfPlayer() || other->IsSubclassOfVehicle() || other->IsSubclassOfVehicleTank()
|| other->isSubclassOf(VehicleCollisionEntity)) {
weap->m_iNumHits++;
@ -2795,7 +2795,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
// Calc the life of the projectile
if (proj->projFlags & P_CHARGE_LIFE) {
if (g_gametype->integer && proj->dmlife) {
if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
newlife = proj->dmlife;
} else {
newlife = proj->life;
@ -2805,7 +2805,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
newlife = proj->minlife;
}
} else {
if (g_gametype->integer && proj->dmlife) {
if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
newlife = proj->dmlife;
} else {
newlife = proj->life;
@ -2818,7 +2818,7 @@ Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float rea
proj->NewAnim("idle");
if (!g_gametype->integer) {
if (g_gametype->integer == GT_SINGLE_PLAYER) {
if (weap) {
weap->m_iNumShotsFired++;
if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
@ -2948,10 +2948,10 @@ void ExplosionAttack(
}
// Remove explosion after the life has expired
if (explosion->life || (g_gametype->integer && explosion->dmlife)) {
if (explosion->life || (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife)) {
ev = new Event(EV_Remove);
if (g_gametype->integer && explosion->dmlife) {
if (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife) {
explosion->PostEvent(ev, explosion->dmlife);
} else {
explosion->PostEvent(ev, explosion->life);

2
code/server/sv_ccmds.c
View file

@ -298,7 +298,7 @@ static void SV_GameMap_f( void ) {
SV_SpawnServer( map, qfalse, qfalse, bTransition );
if( !g_gametype->integer ) {
if( g_gametype->integer == GT_SINGLE_PLAYER ) {
svs.autosave = qtrue;
}
}