summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-10-12 20:52:59 +0200
committerGitHub <noreply@github.com>2020-10-12 20:52:59 +0200
commit1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4 (patch)
treebb6768eda3c5916ecddd9806e830f992996af69d /src/render
parentStreaming and cross-platform fixes (diff)
parentsync with upstream (diff)
downloadre3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.gz
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.bz2
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.lz
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.xz
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.zst
re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.zip
Diffstat (limited to '')
-rw-r--r--src/render/Fluff.cpp4
-rw-r--r--src/render/Fluff.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index 773561f3..19a172fb 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -386,6 +386,8 @@ CMovingThing CMovingThings::StartCloseList;
CMovingThing CMovingThings::EndCloseList;
int16 CMovingThings::Num;
CMovingThing CMovingThings::aMovingThings[NUMMOVINGTHINGS];
+
+int32 CScrollBar::TonightsEvent;
void CMovingThings::Init()
{
@@ -1603,7 +1605,7 @@ void CScriptPath::Update(void) {
void CScriptPath::Clear(void) {
if (m_pNode)
- delete m_pNode;
+ delete[] m_pNode;
m_pNode = nil;
m_numNodes = 0;
for (int i = 0; i < 6; i++)
diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index a6a28cb7..f61da350 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -170,6 +170,9 @@ private:
float m_fScale;
public:
+ static int TonightsEvent;
+
+public:
void SetVisibility(bool visible) { m_bVisible = visible; }
bool IsVisible() { return m_bVisible; }