From be7d1d1a6327426dbe24c5b7b8eb16e5bb83a587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sat, 9 Nov 2019 18:17:54 +0300 Subject: Frontend, Peds & logic and overflow fixes --- src/objects/CutsceneHead.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/objects') diff --git a/src/objects/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp index c423d0b8..8c417973 100644 --- a/src/objects/CutsceneHead.cpp +++ b/src/objects/CutsceneHead.cpp @@ -9,6 +9,7 @@ #include "CutsceneMgr.h" #include "Streaming.h" #include "CutsceneHead.h" +#include "CdStream.h" CCutsceneHead::CCutsceneHead(CObject *obj) @@ -94,7 +95,7 @@ CCutsceneHead::PlayAnimation(const char *animName) stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, "ANIM\\CUTS.IMG"); assert(stream); - CStreaming::MakeSpaceFor(size*2048); + CStreaming::MakeSpaceFor(size * CDSTREAM_SECTOR_SIZE); CStreaming::ImGonnaUseStreamingMemory(); RwStreamSkip(stream, offset*2048); -- cgit v1.2.3 From b83adc2cc92c67e3f2e650f003cf1a613e206285 Mon Sep 17 00:00:00 2001 From: aap Date: Sat, 28 Dec 2019 21:16:00 +0100 Subject: making particleobject compile on vs2015 --- src/objects/ParticleObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/objects') diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 35811289..881510e8 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -9,7 +9,7 @@ #include "Game.h" -CParticleObject (&gPObjectArray)[MAX_PARTICLEOBJECTS] = *(CParticleObject(*)[MAX_PARTICLEOBJECTS])int(0x62A58C); +CParticleObject (&gPObjectArray)[MAX_PARTICLEOBJECTS] = *(CParticleObject(*)[MAX_PARTICLEOBJECTS])*(uintptr*)0x62A58C; CParticleObject *&CParticleObject::pCloseListHead = *(CParticleObject **)int(0x8F4340); CParticleObject *&CParticleObject::pFarListHead = *(CParticleObject **)int(0x942F78); -- cgit v1.2.3