summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-17 09:16:30 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-17 09:16:30 +0200
commit881d61f811608ea99a08b2bb65ce80a40a2c5138 (patch)
treed60187ac151352c886772576da6e06d3acdb1cad /src/entities
parentMerge pull request #458 from erorcun/erorcun (diff)
parentMore CWorld fixes (diff)
downloadre3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar.gz
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar.bz2
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar.lz
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar.xz
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.tar.zst
re3-881d61f811608ea99a08b2bb65ce80a40a2c5138.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Entity.cpp12
-rw-r--r--src/entities/Entity.h3
2 files changed, 14 insertions, 1 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 25e5db48..0efee4e7 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -865,6 +865,16 @@ CEntity::ModifyMatrixForBannerInWind(void)
UpdateRwFrame();
}
+void
+CEntity::AddSteamsFromGround(CPtrList& list)
+{
+ CPtrNode *pNode = list.first;
+ while (pNode) {
+ ((CEntity*)pNode->item)->AddSteamsFromGround(nil);
+ pNode = pNode->next;
+ }
+}
+
#include <new>
class CEntity_ : public CEntity
@@ -912,7 +922,7 @@ STARTPATCHES
InjectHook(0x473F60, &CEntity::DetachFromRwObject, PATCH_JUMP);
InjectHook(0x475A20, &CEntity::PreRenderForGlassWindow, PATCH_JUMP);
- InjectHook(0x50CE40, &CEntity::AddSteamsFromGround, PATCH_JUMP);
+ InjectHook(0x50CE40, (void (CEntity::*)(CVector*))& CEntity::AddSteamsFromGround, PATCH_JUMP);
InjectHook(0x475670, &CEntity::ModifyMatrixForTreeInWind, PATCH_JUMP);
InjectHook(0x475830, &CEntity::ModifyMatrixForBannerInWind, PATCH_JUMP);
InjectHook(0x4FA530, &CEntity::ProcessLightsForEntity, PATCH_JUMP);
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index ca501ba4..dadeee54 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -4,6 +4,7 @@
#include "Placeable.h"
struct CReference;
+class CPtrList;
enum eEntityType
{
@@ -152,5 +153,7 @@ public:
void ModifyMatrixForTreeInWind(void);
void ModifyMatrixForBannerInWind(void);
void ProcessLightsForEntity(void);
+
+ static void AddSteamsFromGround(CPtrList& list);
};
static_assert(sizeof(CEntity) == 0x64, "CEntity: error");