pelletMgr.cpp cleanup/progress

projectPiki · Sep 23, 2024 · fc6cc92 · fc6cc92
1 parent b2a5836
commit fc6cc92
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 289 deletions.
diff --git a/docs/recommended_todo.md b/docs/recommended_todo.md
@@ -83,7 +83,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 48069 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 53090 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 63251 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 64561 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73568 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 86076 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117179 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 134458 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117179 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 130737 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 140997 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 148740 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 163246 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 163886 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 164114 |  |  |
@@ -100,7 +100,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/scrollList.cpp">scrollList.cpp</a> | 25920 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/dayEndCount.cpp">dayEndCount.cpp</a> | 26621 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hurryUp2D.cpp">hurryUp2D.cpp</a> | 27172 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/miulin.cpp">miulin.cpp</a> | 27527 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/jigumo.cpp">jigumo.cpp</a> | 42368 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/shijimiChou.cpp">shijimiChou.cpp</a> | 43362 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModoki.cpp">panModoki.cpp</a> | 45170 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappyState.cpp">kingChappyState.cpp</a> | 50807 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModoki.cpp">panModoki.cpp</a> | 45170 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappyState.cpp">kingChappyState.cpp</a> | 50819 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/umiMushi.cpp">umiMushi.cpp</a> | 60146 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappy.cpp">kingChappy.cpp</a> | 64498 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hiScore2D.cpp">hiScore2D.cpp</a> | 76415 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/blackMan.cpp">blackMan.cpp</a> | 121903 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/zukan2D.cpp">zukan2D.cpp</a> | 134435 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeResult2D.cpp">challengeResult2D.cpp</a> | 142165 |

diff --git a/include/Game/BasePelletMgr.h b/include/Game/BasePelletMgr.h
@@ -13,6 +13,7 @@
 namespace Game {
 struct PelletConfig;
 struct GenPelletParm;
+struct Pellet;
 
 // BasePelletMgr inherits something virtual, but I cannot work out what
 // it seems like all these BaseXMgrs are inheriting something virtual....
@@ -69,6 +70,7 @@ struct BasePelletMgr : public GenericObjectMgr, virtual public _BasePelletMgrPar
 	void setCollTree(Pellet*, int);
 
 	bool used(int);
+	void setUseFlagAll(bool);
 
 	// _00 VTBL
 	// _04 = ptr to NotSure/vtable for NotSure?

diff --git a/include/Game/pelletConfig.h b/include/Game/pelletConfig.h
@@ -59,6 +59,7 @@ struct PelletConfig : public CNode {
 	virtual ~PelletConfig() { }
 
 	inline int getPokoValue() const { return mParams.mMoney.mData; }
+	inline char* getName() const { return mParams.mName.mData; }
 
 	// _00     = VTBL
 	// _00-_18 = CNode

diff --git a/include/Game/pelletMgr.h b/include/Game/pelletMgr.h
@@ -83,6 +83,9 @@ struct PelletMgr : public NodeObjectMgr<GenericObjectMgr> {
 
 		operator s16() { return mValue; }
 
+		inline u8 getPelletKind() { return mValue >> 8; }
+		inline u8 getPelletIndex() { return mValue & 255; }
+
 		bool isNull();
 		void read(Stream&);
 		void write(Stream&);
@@ -124,7 +127,9 @@ struct PelletMgr : public NodeObjectMgr<GenericObjectMgr> {
 	void decode(s32, u8&, int&);
 	int encode(u8, int);
 	BasePelletMgr* getMgrByID(u8);
+	BasePelletMgr* getMgrByIndex(int);
 	void calcNearestTreasure(Vector3f&, f32);
+	void setUseFlagAll(bool);
 
 	static bool mDebug;
 	static bool disableDynamics;
@@ -352,6 +357,7 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
 	void init_pmotions();
 	void update_pmotions();
 	void start_pmotions();
+	void start_carrymotion();
 	void stop_carrymotion();
 	void finish_carrymotion();
 	int getSpeicalSlot();