complete overhaul of directory structure

CMakeLists.txt

@@ -39,16 +39,11 @@ set(MOD_NAME hypermania CACHE STRING "Used as root directory for mod source + lo
 add_library(hypermania SHARED
 	src/GameAPI/C/GameAPI/Game.c
 	src/${MOD_NAME}/dllmain.c
-	src/${MOD_NAME}/Objects/All.c
-	src/${MOD_NAME}/HyperManiaVariables.c
-	src/${MOD_NAME}/ModFunctions.c
 )
 
 target_include_directories(hypermania PRIVATE
-	src/${MOD_NAME}/
-	src/${MOD_NAME}/Objects
-	src/${MOD_NAME}/Mania
-	src/GameAPI/C/
+	src/GameAPI/C
+	src/${MOD_NAME}
 )
 
 if(ANDROID)

src/STRUCTURE

@@ -0,0 +1,4 @@
+Mania -- class definitions copied from mania decomp
+link  -- import macros + compatibility functions for mania classes
+mod   -- import macros + new functions and data for preexisting mania classes
+new   -- new classes

src/hypermania/All.c

@@ -0,0 +1,58 @@
+#include "HyperManiaVariables.c"
+#include "ModFunctions.c"
+
+// =============================================================================
+
+// Import macros + compatibility functions for mania classes -------------------
+
+// =============================================================================
+#include "link/Enemy.c"
+#include "link/BSS/BSS_Setup.c"
+#include "link/Common/CollapsingPlatform.c"
+#include "link/CPZ/CPZSetup.c"
+#include "link/Cutscene/FXFade.c"
+#include "link/ERZ/ERZStart.c"
+#include "link/Global/Animals.c"
+#include "link/Global/Camera.c"
+#include "link/Global/Explosion.c"
+#include "link/Global/InvincibleStars.c"
+#include "link/Global/ItemBox.c"
+#include "link/Global/Music.c"
+#include "link/Global/PauseMenu.c"
+#include "link/Global/Ring.c"
+#include "link/Global/SaveGame.c"
+#include "link/Global/ScoreBonus.c"
+#include "link/Global/Zone.c"
+#include "link/HCZ/HCZSetup.c"
+#include "link/MMZ/FarPlane.c"
+#include "link/OOZ/OOZSetup.c"
+
+// =============================================================================
+
+// Import macros + new functions and data for preexisting mania classes --------
+
+// =============================================================================
+#include "mod/Global/Debris.c"
+#include "mod/Global/HUD.c"
+#include "mod/Global/ImageTrail.c"
+#include "mod/Global/Player.c"
+#include "mod/Global/SpecialRing.c"
+#include "mod/LRZ/HPZEmerald.c"
+#include "mod/Menu/LevelSelect.c"
+#include "mod/Menu/UISaveSlot.c"
+#include "mod/MMZ/PlaneSeeSaw.c"
+#include "mod/UFO/SpecialClear.c"
+#include "mod/UFO/UFO_Player.c"
+#include "mod/UFO/UFO_Setup.c"
+
+// =============================================================================
+
+// New classes used in HyperMania ----------------------------------------------
+
+// =============================================================================
+#include "new/Global/HyperStars.c"
+#include "new/Global/JetGlideEffect.c"
+#include "new/Global/SuperFlicky.c"
+#include "new/HPZ/HPZBeam.c"
+#include "new/HPZ/HPZIntro.c"
+#include "new/HPZ/HPZSetup.c"

src/hypermania/HyperManiaVariables.h

@@ -1,8 +1,8 @@
 #ifndef HYPERMANIAVARIABLES_H
 #define HYPERMANIAVARIABLES_H
 
-#include "Mania/All.h"
 #include "GameAPI/Game.h"
+#include "Mania/All.h"
 
 // =============================================================================
 
@@ -30,6 +30,7 @@
 }
 #define HOOK_IMPORTED_STATE(name, priority) Mod.RegisterStateHook(name, name##_HOOK, priority)
 
+
 // =============================================================================
 
 // Attackable Classes ----------------------------------------------------------
@@ -52,6 +53,7 @@ typedef struct {
 	uint8 flags;
 } attackinfo_t;
 
+
 // =============================================================================
 
 // Misc. + Globals -------------------------------------------------------------