mpsetupfile (not 100% functional yet): load/save setup file, save new setups/groups, increased mp options/scenario data width

src/include/constants.h

@@ -4754,6 +4754,11 @@ enum weaponnum {
 
 #define EXTRA_SLEEP_TIME 1000LL // 100us
 
+#define MPSETUP_MAXSETUPS 100
+#define MPSETUP_MAXGROUPS 100
+#define MPSETUP_MAXGROUPNAME 33
+#define MPSETUP_BLOCKSIZE 64
+
 #endif
 
 #endif

src/include/data.h

@@ -562,6 +562,10 @@ extern s32 g_FileAutoSelect;
 extern u8 g_MpWeaponSetRandomFilters[NUM_MPWEAPONS];
 extern s32 g_MpWeaponRandomFilterNum;
 
+extern struct mpsetupfile g_MpSetupFile;
+extern s16 g_MpCurrentSetup;
+extern s16 g_MpCurrentGroup;
+
 #define PLAYER_EXTCFG() g_PlayerExtCfg[g_Vars.currentplayerstats->mpindex & 3]
 #define PLAYER_DEFAULT_FOV (PLAYER_EXTCFG().fovy)
 

src/include/game/mplayer/mplayer.h

@@ -122,7 +122,6 @@ void mpsetupfileLoadWad(struct savebuffer *buffer);
 void mpsetupfileSaveWad(struct savebuffer *buffer);
 void mpsetupfileGetOverview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum);
 s32 mpsetupfileSave(s32 device, s32 filenum, u16 deviceserial);
-s32 mpsetupfileLoad(s32 device, s32 filenum, u16 deviceserial);
 void func0f18e558(void);
 struct modeldef *func0f18e57c(s32 index, s32 *headnum);
 

src/include/types.h

@@ -6156,6 +6156,24 @@ struct extplayerconfig {
 	s32 usereloads;
 };
 
+struct setupblock {
+	u8 bytes[MPSETUP_BLOCKSIZE];
+};
+
+struct setupgroup {
+	char name[MPSETUP_MAXGROUPNAME];
+	u8 offset_index;
+};
+
+struct mpsetupfile {
+	u8 version;
+	u8 defaultsetup;
+	u8 numsetups;
+	u8 numgroups;
+	struct setupblock setups[MPSETUP_MAXSETUPS];
+	struct setupgroup groups[MPSETUP_MAXGROUPS];
+};
+
 #endif
 
 #endif