summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-16 18:14:48 +0200
committerGitHub <noreply@github.com>2019-06-16 18:14:48 +0200
commitbb526541a956f2876936b2e2320c5da9d32d94d1 (patch)
tree593f1f52b771e2acb82c923e016fcbf73b204a7a /src/control
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
parentChanges for the pull request. (diff)
downloadre3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.gz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.bz2
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.lz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.xz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.zst
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Darkel.cpp6
-rw-r--r--src/control/Darkel.h4
-rw-r--r--src/control/Replay.h3
-rw-r--r--src/control/Script.cpp3
-rw-r--r--src/control/Script.h35
5 files changed, 50 insertions, 1 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index 95f3e176..e2d9fd72 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -3,3 +3,9 @@
#include "Darkel.h"
WRAPPER void CDarkel::DrawMessages(void) { EAXJMP(0x420920); }
+
+bool CDarkel::Status = *(bool*)0x95CCB4;
+
+bool CDarkel::FrenzyOnGoing() {
+ return Status;
+} \ No newline at end of file
diff --git a/src/control/Darkel.h b/src/control/Darkel.h
index 41cc69f8..ed78d4e1 100644
--- a/src/control/Darkel.h
+++ b/src/control/Darkel.h
@@ -2,6 +2,10 @@
class CDarkel
{
+private:
+ static bool Status;
+
public:
static void DrawMessages(void);
+ static bool FrenzyOnGoing();
};
diff --git a/src/control/Replay.h b/src/control/Replay.h
index 5d63db1f..2fe2f272 100644
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -3,11 +3,12 @@
class CReplay
{
public:
- static void Display(void);
enum {
MODE_1 = 1
};
static uint8 &Mode;
static Bool &bPlayingBackFromFile;
+
+ static void Display(void);
};
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 71fc7bcd..7cea978f 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -4,3 +4,6 @@
#include "Script.h"
uint8 *CTheScripts::ScriptSpace = (uint8*)0x74B248;
+CTextLine* CTheScripts::IntroTextLines = (CTextLine*)0x70EA74;
+CScriptRectangle* CTheScripts::IntroRectangles = (CScriptRectangle*)0x72D109;
+CSprite2d* CTheScripts::ScriptSprites = (CSprite2d*)0x72B090;
diff --git a/src/control/Script.h b/src/control/Script.h
index 6f329e1f..0fe35fd2 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -1,7 +1,42 @@
#pragma once
+#include "Sprite2d.h"
+
+struct CScriptRectangle
+{
+ Bool m_bIsUsed;
+ Bool m_bIsAntialiased;
+ uint16 m_wTextureId;
+ CRect m_sRect;
+ CRGBA m_sColor;
+};
+
+struct CTextLine
+{
+ 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;
+ CRGBA m_sBackgroundColor;
+ Bool m_bTextProportional;
+ int32 field_29;
+ Bool m_bRightJustify;
+ int32 field_31;
+ int32 m_nFont;
+ Float field_36;
+ Float field_40;
+ wchar m_awText[500];
+};
class CTheScripts
{
public:
static uint8 *ScriptSpace;//[160*1024]
+ static CTextLine* IntroTextLines;
+ static CScriptRectangle* IntroRectangles;
+ static CSprite2d* ScriptSprites;
};