From f8297df9c5a7d65d5658d1a8d85d391fbb15b95a Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 28 Jun 2021 03:59:07 +0300 Subject: Redo ReadSaveBuf + common.h cleanup --- src/render/Console.h | 2 ++ src/render/Fluff.cpp | 5 +++-- src/render/Particle.cpp | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/render') diff --git a/src/render/Console.h b/src/render/Console.h index b4fa60c4..9f22236f 100644 --- a/src/render/Console.h +++ b/src/render/Console.h @@ -23,3 +23,5 @@ public: }; extern CConsole TheConsole; + +void cprintf(char*, ...); \ No newline at end of file diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index e92eee29..f2d6d0b3 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -23,6 +23,7 @@ #include "World.h" #include "Replay.h" #include "Coronas.h" +#include "SaveBuf.h" CPlaneTrail CPlaneTrails::aArray[6]; RwImVertexIndex TrailIndices[32] = { @@ -1267,7 +1268,7 @@ INITSAVEBUF aArray[i].Clear(); for (int32 i = 0; i < 3; i++) { - aArray[i] = ReadSaveBuf(buf); + ReadSaveBuf(&aArray[i], buf); for (int32 j = 0; j < 6; j++) { CScriptPath *pPath = &aArray[i]; @@ -1279,7 +1280,7 @@ INITSAVEBUF aArray[i].m_pNode = new CPlaneNode[aArray[i].m_numNodes]; for (int32 j = 0; j < aArray[i].m_numNodes; j++) { - aArray[i].m_pNode[j] = ReadSaveBuf(buf); + ReadSaveBuf(&aArray[i].m_pNode[j], buf); } } VALIDATESAVEBUF(size) diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp index 334ceb57..f6d48aef 100644 --- a/src/render/Particle.cpp +++ b/src/render/Particle.cpp @@ -19,7 +19,8 @@ #include "ParticleObject.h" #include "Particle.h" #include "soundlist.h" - +#include "SaveBuf.h" +#include "debugmenu.h" #define MAX_PARTICLES_ON_SCREEN (750) -- cgit v1.2.3