partial-feat: system work

projectPiki · Dec 15, 2024 · 8259432 · 8259432
1 parent aef3a22
commit 8259432
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 540 deletions.
diff --git a/include/Collision.h b/include/Collision.h
@@ -179,10 +179,6 @@ struct CndBombable : public CndCollPart {
 	// TODO: members
 };
 
-struct ShpobjInfo : public GfxobjInfo {
-	Shape* mTarget; // _20
-};
-
 /**
  * @brief TODO
  *
@@ -233,8 +229,7 @@ struct CollInfo {
 /**
  * @brief TODO
  */
-struct CollGroup {
-};
+struct CollGroup { };
 
 /**
  * @brief TODO

diff --git a/include/GfxObject.h b/include/GfxObject.h
@@ -19,6 +19,14 @@ struct GfxobjInfo {
 		mAttached = 0;
 	}
 
+	void insertAfter(GfxobjInfo* other)
+	{
+		other->mNext = mNext;
+		other->mPrev = this;
+		mNext->mPrev = other;
+		mNext        = other;
+	}
+
 	// _1C = VTBL
 	GfxobjInfo* mPrev; // _04
 	GfxobjInfo* mNext; // _08
@@ -41,4 +49,13 @@ struct GfxObject {
 	// TODO: members
 };
 
+struct ShpobjInfo : public GfxobjInfo {
+	ShpobjInfo()
+	    : mTarget(nullptr)
+	{
+	}
+
+	struct Shape* mTarget; // _20
+};
+
 #endif
diff --git a/include/system.h b/include/system.h
@@ -108,7 +108,7 @@ struct StdSystem {
 	GfxobjInfo* findGfxObject(char*, u32);
 	Texture* loadTexture(char*, bool);
 	Shape* loadShape(char*, bool);
-	void findAnimation(char*);
+	AnimData* findAnimation(char*);
 	int findAnyIndex(char*, char*);
 	AnimData* loadAnimation(Shape*, char*, bool);
 	void addAnimation(AnimData*, char*);
@@ -117,7 +117,7 @@ struct StdSystem {
 	void detachObjs();
 	void invalidateObjs(u32, u32);
 	void addTexture(Texture*, char*);
-	void getShape(char*, char*, char*, bool);
+	Shape* getShape(char*, char*, char*, bool);
 	void initLFlares(int);
 	void resetLFlares();
 	LFInfo* getLFlareInfo();
@@ -183,7 +183,7 @@ struct StdSystem {
 	// the vtable has to be at 0x1A0, so it's in the middle, yes.
 	// OR everything above this is a separate struct with some inheritance (doubt)
 	virtual void initSoftReset();                               // _08
-	virtual BufferedInputStream* openFile(char*, bool, bool);   // _0C
+	virtual RandomAccessStream* openFile(char*, bool, bool);    // _0C
 	virtual u32 copyRamToCache(u32, u32, u32) { return 0; }     // _10
 	virtual void copyCacheToRam(u32, u32, u32) { }              // _14
 	virtual void copyWaitUntilDone() { }                        // _18
@@ -229,16 +229,16 @@ struct StdSystem {
 struct System : public StdSystem {
 	System();
 
-	virtual void initSoftReset();                             // _08
-	virtual BufferedInputStream* openFile(char*, bool, bool); // _0C
-	virtual u32 copyRamToCache(u32, u32, u32);                // _10
-	virtual void copyCacheToRam(u32, u32, u32);               // _14
-	virtual void copyWaitUntilDone();                         // _18
-	virtual void copyCacheToTexture(CacheTexture*);           // _1C
-	virtual void parseArchiveDirectory(char*, char*);         // _24
-	virtual void sndPlaySe(u32);                              // _28
-	virtual void startLoading(LoadIdler*, bool, u32);         // _2C
-	virtual void endLoading();                                // _30
+	virtual void initSoftReset();                            // _08
+	virtual RandomAccessStream* openFile(char*, bool, bool); // _0C
+	virtual u32 copyRamToCache(u32, u32, u32);               // _10
+	virtual void copyCacheToRam(u32, u32, u32);              // _14
+	virtual void copyWaitUntilDone();                        // _18
+	virtual void copyCacheToTexture(CacheTexture*);          // _1C
+	virtual void parseArchiveDirectory(char*, char*);        // _24
+	virtual void sndPlaySe(u32);                             // _28
+	virtual void startLoading(LoadIdler*, bool, u32);        // _2C
+	virtual void endLoading();                               // _30
 
 	~System();
 

diff --git a/src/plugPikiColin/game.cpp b/src/plugPikiColin/game.cpp
@@ -114,7 +114,7 @@ void FlowController::setStage(char*)
 void FlowController::readMapList(char* fileName)
 {
 	mRootInfo.initCore("stages");
-	BufferedInputStream* file = gsys->openFile(fileName, true, true);
+	RandomAccessStream* file = gsys->openFile(fileName, true, true);
 	if (!file) {
 		return;
 	}

diff --git a/src/sysCommon/node.cpp b/src/sysCommon/node.cpp
@@ -109,7 +109,7 @@ void CoreNode::load(char* p1, char* p2, u32 p3)
 {
 	char buf[256];
 	sprintf(buf, "%s%s", p1, p2);
-	BufferedInputStream* stream = gsys->openFile(buf, true, true);
+	RandomAccessStream* stream = gsys->openFile(buf, true, true);
 	if (stream) {
 		read(*stream);
 		stream->close();