diff options
author | aap <aap@papnet.eu> | 2019-06-17 00:16:38 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-17 00:23:19 +0200 |
commit | 0add48abf589330ae6fe11e304c111d9f52ce009 (patch) | |
tree | e9f4374bf520a2fdfb9f3d66cd4ed0aa822a020b /src/control | |
parent | updated guidelines (diff) | |
download | re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.gz re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.bz2 re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.lz re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.xz re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.zst re3-0add48abf589330ae6fe11e304c111d9f52ce009.zip |
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/Population.cpp | 2 | ||||
-rw-r--r-- | src/control/Population.h | 2 | ||||
-rw-r--r-- | src/control/Record.cpp | 4 | ||||
-rw-r--r-- | src/control/Record.h | 4 | ||||
-rw-r--r-- | src/control/Replay.cpp | 2 | ||||
-rw-r--r-- | src/control/Replay.h | 2 | ||||
-rw-r--r-- | src/control/Script.h | 28 |
7 files changed, 22 insertions, 22 deletions
diff --git a/src/control/Population.cpp b/src/control/Population.cpp index 3626381d..9327452b 100644 --- a/src/control/Population.cpp +++ b/src/control/Population.cpp @@ -1,4 +1,4 @@ #include "common.h" #include "Population.h" -Bool &CPopulation::ms_bGivePedsWeapons = *(Bool*)0x95CCF6;
\ No newline at end of file +bool &CPopulation::ms_bGivePedsWeapons = *(bool*)0x95CCF6;
\ No newline at end of file diff --git a/src/control/Population.h b/src/control/Population.h index e01d2712..ce27657a 100644 --- a/src/control/Population.h +++ b/src/control/Population.h @@ -3,5 +3,5 @@ class CPopulation { public: - static Bool &ms_bGivePedsWeapons; + static bool &ms_bGivePedsWeapons; };
\ No newline at end of file diff --git a/src/control/Record.cpp b/src/control/Record.cpp index 8949da5e..4cc2dccd 100644 --- a/src/control/Record.cpp +++ b/src/control/Record.cpp @@ -1,6 +1,6 @@ #include "common.h" #include "Record.h" -UInt16 &CRecordDataForGame::RecordingState = *(UInt16*)0x95CC24; +uint16 &CRecordDataForGame::RecordingState = *(uint16*)0x95CC24; -UInt8 &CRecordDataForChase::Status = *(UInt8*)0x95CDCE; +uint8 &CRecordDataForChase::Status = *(uint8*)0x95CDCE; diff --git a/src/control/Record.h b/src/control/Record.h index 97a9663d..2b904d1d 100644 --- a/src/control/Record.h +++ b/src/control/Record.h @@ -3,11 +3,11 @@ class CRecordDataForGame { public: - static UInt16 &RecordingState; + static uint16 &RecordingState; }; class CRecordDataForChase { public: - static UInt8 &Status; + static uint8 &Status; }; diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index b1bdc1bf..80edf097 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -3,6 +3,6 @@ #include "Replay.h" uint8 &CReplay::Mode = *(uint8*)0x95CD5B; -Bool &CReplay::bPlayingBackFromFile = *(Bool*)0x95CD58; +bool &CReplay::bPlayingBackFromFile = *(bool*)0x95CD58; WRAPPER void CReplay::Display(void) { EAXJMP(0x595EE0); } diff --git a/src/control/Replay.h b/src/control/Replay.h index 2fe2f272..70835596 100644 --- a/src/control/Replay.h +++ b/src/control/Replay.h @@ -8,7 +8,7 @@ public: }; static uint8 &Mode; - static Bool &bPlayingBackFromFile; + static bool &bPlayingBackFromFile; static void Display(void); }; diff --git a/src/control/Script.h b/src/control/Script.h index 0fe35fd2..cdc33e97 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -3,8 +3,8 @@ struct CScriptRectangle { - Bool m_bIsUsed; - Bool m_bIsAntialiased; + bool m_bIsUsed; + bool m_bIsAntialiased; uint16 m_wTextureId; CRect m_sRect; CRGBA m_sColor; @@ -12,23 +12,23 @@ struct CScriptRectangle struct CTextLine { - Float m_fScaleX; - Float m_fScaleY; + float m_fScaleX; + float m_fScaleY; CRGBA m_sColor; - Bool m_bJustify; - Bool m_bCentered; - Bool m_bBackground; - Bool m_bBackgroundOnly; - Float m_fWrapX; - Float m_fCenterSize; + bool m_bJustify; + bool m_bCentered; + bool m_bBackground; + bool m_bBackgroundOnly; + float m_fWrapX; + float m_fCenterSize; CRGBA m_sBackgroundColor; - Bool m_bTextProportional; + bool m_bTextProportional; int32 field_29; - Bool m_bRightJustify; + bool m_bRightJustify; int32 field_31; int32 m_nFont; - Float field_36; - Float field_40; + float field_36; + float field_40; wchar m_awText[500]; }; |