Mania folder structure now reflects decomp structure better

tariq-nasheed · Apr 10, 2024 · bee5000 · bee5000
1 parent 54dcc40
commit bee5000
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 51 deletions.
diff --git a/src/hypermania/Mania/All.h b/src/hypermania/Mania/All.h
@@ -2,12 +2,7 @@
 #define MANIA_ALL_H
 
 #include "../GameAPI/C/GameAPI/Game.h"
-
-#include "FarPlane.h"
-#include "ItemBox.h"
 #include "Player.h"
-#include "SaveGame.h"
-#include "ScoreBonus.h"
-#include "Zone.h"
+#include "FarPlane.h"
 
 #endif //! MANIA_ALL_H
diff --git a/src/hypermania/Mania/CollapsingPlatform.c → ...ermania/Mania/Common/CollapsingPlatform.c b/src/hypermania/Mania/CollapsingPlatform.c → ...ermania/Mania/Common/CollapsingPlatform.c
diff --git a/src/hypermania/Mania/CollapsingPlatform.h → ...ermania/Mania/Common/CollapsingPlatform.h b/src/hypermania/Mania/CollapsingPlatform.h → ...ermania/Mania/Common/CollapsingPlatform.h
diff --git a/src/hypermania/Mania/FXFade.c → src/hypermania/Mania/Cutscene/FXFade.c b/src/hypermania/Mania/FXFade.c → src/hypermania/Mania/Cutscene/FXFade.c
diff --git a/src/hypermania/Mania/FXFade.h → src/hypermania/Mania/Cutscene/FXFade.h b/src/hypermania/Mania/FXFade.h → src/hypermania/Mania/Cutscene/FXFade.h
diff --git a/src/hypermania/Mania/Animals.c → src/hypermania/Mania/Global/Animals.c b/src/hypermania/Mania/Animals.c → src/hypermania/Mania/Global/Animals.c
diff --git a/src/hypermania/Mania/Animals.h → src/hypermania/Mania/Global/Animals.h b/src/hypermania/Mania/Animals.h → src/hypermania/Mania/Global/Animals.h
diff --git a/src/hypermania/Mania/Camera.c → src/hypermania/Mania/Global/Camera.c b/src/hypermania/Mania/Camera.c → src/hypermania/Mania/Global/Camera.c
diff --git a/src/hypermania/Mania/Camera.h → src/hypermania/Mania/Global/Camera.h b/src/hypermania/Mania/Camera.h → src/hypermania/Mania/Global/Camera.h
diff --git a/src/hypermania/Mania/Explosion.c → src/hypermania/Mania/Global/Explosion.c b/src/hypermania/Mania/Explosion.c → src/hypermania/Mania/Global/Explosion.c
diff --git a/src/hypermania/Mania/Explosion.h → src/hypermania/Mania/Global/Explosion.h b/src/hypermania/Mania/Explosion.h → src/hypermania/Mania/Global/Explosion.h
diff --git a/src/hypermania/Mania/ItemBox.c → src/hypermania/Mania/Global/ItemBox.c b/src/hypermania/Mania/ItemBox.c → src/hypermania/Mania/Global/ItemBox.c
diff --git a/src/hypermania/Mania/ItemBox.h → src/hypermania/Mania/Global/ItemBox.h b/src/hypermania/Mania/ItemBox.h → src/hypermania/Mania/Global/ItemBox.h
diff --git a/src/hypermania/Mania/Music.c → src/hypermania/Mania/Global/Music.c b/src/hypermania/Mania/Music.c → src/hypermania/Mania/Global/Music.c
diff --git a/src/hypermania/Mania/Music.h → src/hypermania/Mania/Global/Music.h b/src/hypermania/Mania/Music.h → src/hypermania/Mania/Global/Music.h
diff --git a/src/hypermania/Mania/Ring.c → src/hypermania/Mania/Global/Ring.c b/src/hypermania/Mania/Ring.c → src/hypermania/Mania/Global/Ring.c
diff --git a/src/hypermania/Mania/Ring.h → src/hypermania/Mania/Global/Ring.h b/src/hypermania/Mania/Ring.h → src/hypermania/Mania/Global/Ring.h
diff --git a/src/hypermania/Mania/SaveGame.c → src/hypermania/Mania/Global/SaveGame.c b/src/hypermania/Mania/SaveGame.c → src/hypermania/Mania/Global/SaveGame.c
diff --git a/src/hypermania/Mania/SaveGame.h → src/hypermania/Mania/Global/SaveGame.h b/src/hypermania/Mania/SaveGame.h → src/hypermania/Mania/Global/SaveGame.h
diff --git a/src/hypermania/Mania/ScoreBonus.c → src/hypermania/Mania/Global/ScoreBonus.c b/src/hypermania/Mania/ScoreBonus.c → src/hypermania/Mania/Global/ScoreBonus.c
diff --git a/src/hypermania/Mania/ScoreBonus.h → src/hypermania/Mania/Global/ScoreBonus.h b/src/hypermania/Mania/ScoreBonus.h → src/hypermania/Mania/Global/ScoreBonus.h
diff --git a/src/hypermania/Mania/Zone.c → src/hypermania/Mania/Global/Zone.c b/src/hypermania/Mania/Zone.c → src/hypermania/Mania/Global/Zone.c
diff --git a/src/hypermania/Mania/Zone.h → src/hypermania/Mania/Global/Zone.h b/src/hypermania/Mania/Zone.h → src/hypermania/Mania/Global/Zone.h
diff --git a/src/hypermania/ModFunctions.h b/src/hypermania/ModFunctions.h
@@ -4,18 +4,18 @@
 #include "HyperManiaVariables.h"
 
 #include "Objects/Player.h"
-#include "Mania/SaveGame.h"
-#include "Mania/Animals.h"
-#include "Mania/Camera.h"
-#include "Mania/CollapsingPlatform.h"
-#include "Mania/Debris.h"
-#include "Mania/Explosion.h"
-#include "Mania/FXFade.h"
-#include "Mania/ItemBox.h"
-#include "Mania/Ring.h"
-#include "Mania/ScoreBonus.h"
-#include "Mania/Zone.h"
-#include "Mania/Music.h"
+#include "Mania/Global/SaveGame.h"
+#include "Mania/Global/Animals.h"
+#include "Mania/Global/Camera.h"
+#include "Mania/Common/CollapsingPlatform.h"
+#include "Objects/Debris.h"
+#include "Mania/Global/Explosion.h"
+#include "Mania/Cutscene/FXFade.h"
+#include "Mania/Global/ItemBox.h"
+#include "Mania/Global/Ring.h"
+#include "Mania/Global/ScoreBonus.h"
+#include "Mania/Global/Zone.h"
+#include "Mania/Global/Music.h"
 #include "Mania/Global/PauseMenu.h"
 #include "Mania/Global/InvincibleStars.h"
 

diff --git a/src/hypermania/Objects/All.c b/src/hypermania/Objects/All.c
@@ -1,16 +1,16 @@
 #include "ModFunctions.h"
 
-#include "Mania/SaveGame.c"
-#include "Mania/Animals.c"
-#include "Mania/Camera.c"
-#include "Mania/CollapsingPlatform.c"
-#include "Mania/Explosion.c"
-#include "Mania/FXFade.c"
-#include "Mania/Ring.c"
-#include "Mania/ScoreBonus.c"
-#include "Mania/ItemBox.c"
-#include "Mania/Zone.c"
-#include "Mania/Music.c"
+#include "Mania/Global/SaveGame.c"
+#include "Mania/Global/Animals.c"
+#include "Mania/Global/Camera.c"
+#include "Mania/Common/CollapsingPlatform.c"
+#include "Mania/Global/Explosion.c"
+#include "Mania/Cutscene/FXFade.c"
+#include "Mania/Global/Ring.c"
+#include "Mania/Global/ScoreBonus.c"
+#include "Mania/Global/ItemBox.c"
+#include "Mania/Global/Zone.c"
+#include "Mania/Global/Music.c"
 #include "Mania/Global/PauseMenu.c"
 #include "Mania/Global/InvincibleStars.c"
 
@@ -44,7 +44,7 @@ uint32 sonic3_emerald_lookup[7] = { 0, 1, 3, 2, 4, 6, 5 };
 #include "UISaveSlot.c"
 #include "LevelSelect.c"
 #include "PlaneSeeSaw.c"
-#include "Mania/Debris.c"
+#include "Debris.c"
 
 #include "SuperFlicky.c"
 #include "HyperStars.c"

diff --git a/src/hypermania/Mania/Debris.c → src/hypermania/Objects/Debris.c b/src/hypermania/Mania/Debris.c → src/hypermania/Objects/Debris.c
diff --git a/src/hypermania/Mania/Debris.h → src/hypermania/Objects/Debris.h b/src/hypermania/Mania/Debris.h → src/hypermania/Objects/Debris.h
diff --git a/src/hypermania/Objects/HyperStars.c b/src/hypermania/Objects/HyperStars.c
@@ -1,6 +1,6 @@
 #include "HyperStars.h"
 #include "Player.h"
-#include "Zone.h"
+#include "Mania/Global/Zone.h"
 
 ObjectHyperStars* HyperStars;
 

diff --git a/src/hypermania/Objects/ImageTrail.c b/src/hypermania/Objects/ImageTrail.c
@@ -1,6 +1,6 @@
 #include "ImageTrail.h"
 #include "Player.h"
-#include "Zone.h"
+#include "Mania/Global/Zone.h"
 
 ObjectImageTrail* ImageTrail;
 

diff --git a/src/hypermania/Objects/Player.c b/src/hypermania/Objects/Player.c
@@ -1,14 +1,14 @@
 #include "Player.h"
-#include "Camera.h"
+#include "Mania/Global/Camera.h"
 #include "Debris.h"
-#include "FXFade.h"
-#include "Ring.h"
-#include "ItemBox.h"
+#include "Mania/Cutscene/FXFade.h"
+#include "Mania/Global/Ring.h"
+#include "Mania/Global/ItemBox.h"
 #include "ImageTrail.h"
 #include "SuperFlicky.h"
 #include "HyperStars.h"
 #include "JetGlideEffect.h"
-#include "Zone.h"
+#include "Mania/Global/Zone.h"
 
 #include "CPZ/CPZSetup.h"
 #include "OOZ/OOZSetup.h"

diff --git a/src/hypermania/Objects/SpecialRing.c b/src/hypermania/Objects/SpecialRing.c
@@ -1,6 +1,6 @@
 #include "SpecialRing.h"
 #include "HPZ/HPZSetup.h"
-#include "Zone.h"
+#include "Mania/Global/Zone.h"
 
 
 // -----------------------------------------------------------------------------

diff --git a/src/hypermania/Objects/SuperFlicky.c b/src/hypermania/Objects/SuperFlicky.c
@@ -1,7 +1,7 @@
 #include "SuperFlicky.h"
 #include "Debris.h"
 #include "Player.h"
-#include "Zone.h"
+#include "Mania/Global/Zone.h"
 
 #include "CPZ/CPZSetup.h"
 #include "OOZ/OOZSetup.h"

diff --git a/src/hypermania/dllmain.c b/src/hypermania/dllmain.c
@@ -3,17 +3,17 @@
 #include "ModFunctions.h"
 
 // game classes litte/no notable modifications
-#include "Mania/SaveGame.h"
-#include "Mania/Animals.h"
-#include "Mania/Camera.h"
-#include "Mania/CollapsingPlatform.h"
-#include "Mania/Explosion.h"
-#include "Mania/FXFade.h"
-#include "Mania/ItemBox.h"
-#include "Mania/Ring.h"
-#include "Mania/ScoreBonus.h"
-#include "Mania/Zone.h"
-#include "Mania/Music.h"
+#include "Mania/Global/SaveGame.h"
+#include "Mania/Global/Animals.h"
+#include "Mania/Global/Camera.h"
+#include "Mania/Common/CollapsingPlatform.h"
+#include "Mania/Global/Explosion.h"
+#include "Mania/Cutscene/FXFade.h"
+#include "Mania/Global/ItemBox.h"
+#include "Mania/Global/Ring.h"
+#include "Mania/Global/ScoreBonus.h"
+#include "Mania/Global/Zone.h"
+#include "Mania/Global/Music.h"
 #include "Mania/Global/PauseMenu.h"
 #include "Mania/Global/InvincibleStars.h"
 
@@ -36,7 +36,7 @@
 #include "Objects/LevelSelect.h"
 #include "Objects/HPZ/HPZEmerald.h"
 #include "Objects/PlaneSeeSaw.h"
-#include "Mania/Debris.h"
+#include "Objects/Debris.h"
 
 // new classes
 #include "Objects/SuperFlicky.h"