From 0bca41c2022a949d2c6667332364fd16e3c825ec Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 30 May 2013 10:18:46 +0000 Subject: [PATCH] - replaced unused RNGs with pr_damagemobj for consistency checksum. SVN r4297 (trunk) --- src/g_doom/a_lostsoul.cpp | 1 - src/m_random.cpp | 6 ++---- src/p_interaction.cpp | 2 +- src/p_mobj.cpp | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/g_doom/a_lostsoul.cpp b/src/g_doom/a_lostsoul.cpp index b6c2ee067..fdc0257cb 100644 --- a/src/g_doom/a_lostsoul.cpp +++ b/src/g_doom/a_lostsoul.cpp @@ -12,7 +12,6 @@ #include "thingdef/thingdef.h" */ - FRandom pr_lost ("LostMissileRange"); FRandom pr_oldsoul ("BetaLostSoul"); // diff --git a/src/m_random.cpp b/src/m_random.cpp index 436b803bc..763410111 100644 --- a/src/m_random.cpp +++ b/src/m_random.cpp @@ -86,9 +86,8 @@ extern FRandom pr_spawnmobj; extern FRandom pr_acs; extern FRandom pr_chase; -extern FRandom pr_lost; -extern FRandom pr_slam; extern FRandom pr_exrandom; +extern FRandom pr_damagemobj; // PUBLIC DATA DEFINITIONS ------------------------------------------------- @@ -245,8 +244,7 @@ DWORD FRandom::StaticSumSeeds () pr_spawnmobj.sfmt.u[0] + pr_spawnmobj.idx + pr_acs.sfmt.u[0] + pr_acs.idx + pr_chase.sfmt.u[0] + pr_chase.idx + - pr_lost.sfmt.u[0] + pr_lost.idx + - pr_slam.sfmt.u[0] + pr_slam.idx; + pr_damagemobj.sfmt.u[0] + pr_damagemobj.idx; } //========================================================================== diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index cadf5a829..96b52e0b7 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -62,7 +62,7 @@ static FRandom pr_obituary ("Obituary"); static FRandom pr_botrespawn ("BotRespawn"); static FRandom pr_killmobj ("ActorDie"); -static FRandom pr_damagemobj ("ActorTakeDamage"); +FRandom pr_damagemobj ("ActorTakeDamage"); static FRandom pr_lightning ("LightningDamage"); static FRandom pr_poison ("PoisonDamage"); static FRandom pr_switcher ("SwitchTarget"); diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 955672c67..083ba23fb 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -105,7 +105,6 @@ static FRandom pr_chunk ("Chunk"); static FRandom pr_checkmissilespawn ("CheckMissileSpawn"); static FRandom pr_spawnmissile ("SpawnMissile"); static FRandom pr_missiledamage ("MissileDamage"); - FRandom pr_slam ("SkullSlam"); static FRandom pr_multiclasschoice ("MultiClassChoice"); static FRandom pr_rockettrail("RocketTrail"); static FRandom pr_uniquetid("UniqueTID");