diff options
author | aap <aap@papnet.eu> | 2019-07-17 23:58:06 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-17 23:58:06 +0200 |
commit | ba242bcf584d885167a9499e53f5bcaf6c9cc866 (patch) | |
tree | 29477a626a36462ec3280081388ff1b965be860f /src/core | |
parent | Merge pull request #145 from guard3/master (diff) | |
download | re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.gz re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.bz2 re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.lz re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.xz re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.tar.zst re3-ba242bcf584d885167a9499e53f5bcaf6c9cc866.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/Pad.h | 3 | ||||
-rw-r--r-- | src/core/Streaming.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h index f853a8cd..f84ca742 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -197,7 +197,7 @@ public: int16 Mode; int16 ShakeDur; uint8 ShakeFreq; - int8 bHornHistory[5]; + bool bHornHistory[5]; uint8 iCurrHornHistory; uint8 DisablePlayerControls; int8 bApplyBrakes; @@ -377,6 +377,7 @@ public: bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; } }; VALIDATE_SIZE(CPad, 0xFC); +extern CPad *Pads; //[2] #define IsButtonJustDown(pad, btn) \ (!(pad)->OldState.btn && (pad)->NewState.btn) diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index a23e35be..9d9241e4 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1048,8 +1048,6 @@ CStreaming::RemoveReferencedTxds(int32 mem) return false; } -// TODO: RemoveCurrentZonesModels - void CStreaming::RemoveUnusedModelsInLoadedList(void) { |