summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
author_AG <gennariarmando@outlook.com>2019-06-20 15:18:15 +0200
committer_AG <gennariarmando@outlook.com>2019-06-20 15:18:19 +0200
commitf3c331ece6160b9cb27a276a19a2c130197a4625 (patch)
tree624b5d51f10ec44b130e7c8639d532daade30006 /src/control
parentstarted CStreaming (diff)
downloadre3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar.gz
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar.bz2
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar.lz
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar.xz
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.tar.zst
re3-f3c331ece6160b9cb27a276a19a2c130197a4625.zip
Diffstat (limited to '')
-rw-r--r--src/control/Darkel.cpp2
-rw-r--r--src/control/Garages.cpp8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index aece455d..32d975e0 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -8,5 +8,5 @@ bool CDarkel::Status = *(bool*)0x95CCB4;
bool CDarkel::FrenzyOnGoing()
{
- return Status;
+ return Status == 1;
} \ No newline at end of file
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 6f1ad028..70a15476 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -8,8 +8,6 @@
#include "Messages.h"
#include "Text.h"
-//WRAPPER void CGarages::PrintMessages(void) { EAXJMP(0x426310); }
-
int32 &CGarages::BankVansCollected = *(int32 *)0x8F1B34;
bool &CGarages::BombsAreFree = *(bool *)0x95CD7A;
bool &CGarages::RespraysAreFree = *(bool *)0x95CD1D;
@@ -65,6 +63,9 @@ CGarages::IsModelIndexADoor(uint32 id)
id == MI_CRUSHERLID;
}
+#if 0
+WRAPPER void CGarages::PrintMessages(void) { EAXJMP(0x426310); }
+#else
void CGarages::PrintMessages()
{
if (CTimer::GetTimeInMilliseconds() > CGarages::MessageStartTime && CTimer::GetTimeInMilliseconds() < CGarages::MessageEndTime) {
@@ -104,4 +105,5 @@ void CGarages::PrintMessages()
CFont::PrintString((SCREEN_WIDTH / 2), (SCREEN_HEIGHT / 2) + SCREEN_SCALE_Y(-84.0f - 40.0f), gUString);
}
}
-} \ No newline at end of file
+}
+#endif