AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Rename globals

Browse Source
This commit is contained in:
Phillip Stephens
2016-02-07 08:15:43 -08:00
parent 8fbe6a953c
commit a96601f1b4
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/CRandom16.hpp
View File

@@ -6,12 +6,11 @@
namespace Retro
{
extern class CRandom16* GLOBAL_RANDOM;
extern class CGlobalRandom* GLOBAL_RANDOM_TOKEN;
class CRandom16
{
u32 m_seed;
static CRandom16* g_randomNumber;
public:
CRandom16(u32 p) : m_seed(p) {}
@@ -50,24 +49,25 @@ public:
return rand % diff + min;
}
static CRandom16* GetRandomNumber() {return GLOBAL_RANDOM;}
static void SetRandomNumber(CRandom16* rnd) {GLOBAL_RANDOM = rnd;}
static CRandom16* GetRandomNumber() {return g_randomNumber;}
static void SetRandomNumber(CRandom16* rnd) {g_randomNumber = rnd;}
};
class CGlobalRandom
{
CRandom16& m_random;
CGlobalRandom* m_prev;
static CGlobalRandom* g_currentGlobalRandom;
public:
CGlobalRandom(CRandom16& rand)
: m_random(rand), m_prev(GLOBAL_RANDOM_TOKEN)
: m_random(rand), m_prev(g_currentGlobalRandom)
{
GLOBAL_RANDOM_TOKEN = this;
g_currentGlobalRandom = this;
CRandom16::SetRandomNumber(&m_random);
}
~CGlobalRandom()
{
GLOBAL_RANDOM_TOKEN = m_prev;
g_currentGlobalRandom = m_prev;
if (m_prev)
CRandom16::SetRandomNumber(&m_prev->m_random);
else