Rename CampaignOptions -> Campaign

src/briefing_screens.c

@@ -361,7 +361,7 @@ typedef struct
 typedef struct
 {
 	MenuSystem ms;
-	const CampaignOptions *c;
+	const Campaign *c;
 	struct MissionOptions *m;
 	bool completed;
 	AnimatedCounter AccessBonus;
@@ -376,7 +376,7 @@ static void MissionSummaryMenuDraw(
 	const menu_t *menu, GraphicsDevice *g,
 	const struct vec2i p, const struct vec2i size, const void *data);
 GameLoopData *ScreenMissionSummary(
-	const CampaignOptions *c, struct MissionOptions *m, const bool completed)
+	const Campaign *c, struct MissionOptions *m, const bool completed)
 {
 	MissionSummaryData *mData;
 	CCALLOC(mData, sizeof *mData);

src/briefing_screens.h

@@ -35,4 +35,4 @@ GameLoopData *ScreenMissionBriefing(const struct MissionOptions *m);
 // Display a summary page at the end of a mission
 // Returns true if the game is to continue
 GameLoopData *ScreenMissionSummary(
-	const CampaignOptions *c, struct MissionOptions *m, const bool completed);
+	const Campaign *c, struct MissionOptions *m, const bool completed);

src/cdogs/campaigns.c

@@ -40,14 +40,14 @@
 #include <cdogs/utils.h>
 
 
-void CampaignInit(CampaignOptions *campaign)
+void CampaignInit(Campaign *campaign)
 {
 	memset(campaign, 0, sizeof *campaign);
 	CampaignSettingInit(&campaign->Setting);
 	// TESTING
 	campaign->WeaponPersist = true;
 }
-void CampaignTerminate(CampaignOptions *campaign)
+void CampaignTerminate(Campaign *campaign)
 {
 	CampaignUnload(&gCampaign);
 	CampaignSettingTerminate(&campaign->Setting);
@@ -203,7 +203,7 @@ static void LoadCampaignsFromFolder(
 	tinydir_close(&dir);
 }
 
-Mission *CampaignGetCurrentMission(CampaignOptions *campaign)
+Mission *CampaignGetCurrentMission(Campaign *campaign)
 {
 	if (campaign->MissionIndex >= (int)campaign->Setting.Missions.size)
 	{
@@ -212,7 +212,7 @@ Mission *CampaignGetCurrentMission(CampaignOptions *campaign)
 	return CArrayGet(&campaign->Setting.Missions, campaign->MissionIndex);
 }
 
-void CampaignSeedRandom(const CampaignOptions *campaign)
+void CampaignSeedRandom(const Campaign *campaign)
 {
 	const int seed =
 		10 * campaign->MissionIndex + ConfigGetInt(&gConfig, "Game.RandomSeed");
@@ -221,7 +221,7 @@ void CampaignSeedRandom(const CampaignOptions *campaign)
 }
 
 void CampaignAndMissionSetup(
-	CampaignOptions *campaign, struct MissionOptions *mo)
+	Campaign *campaign, struct MissionOptions *mo)
 {
 	Mission *m = CampaignGetCurrentMission(campaign);
 	if (m == NULL)

src/cdogs/campaigns.h

@@ -70,19 +70,19 @@ typedef struct
 	bool OptionsSet;
 	bool IsComplete;
 	bool WeaponPersist;
-} CampaignOptions;
-extern CampaignOptions gCampaign;
+} Campaign;
+extern Campaign gCampaign;
 
-void CampaignInit(CampaignOptions *campaign);
-void CampaignTerminate(CampaignOptions *campaign);
+void CampaignInit(Campaign *campaign);
+void CampaignTerminate(Campaign *campaign);
 void CampaignSettingInit(CampaignSetting *setting);
 void CampaignSettingTerminate(CampaignSetting *setting);
 
 void LoadAllCampaigns(custom_campaigns_t *campaigns);
 void UnloadAllCampaigns(custom_campaigns_t *campaigns);
 
-Mission *CampaignGetCurrentMission(CampaignOptions *campaign);
-void CampaignSeedRandom(const CampaignOptions *campaign);
+Mission *CampaignGetCurrentMission(Campaign *campaign);
+void CampaignSeedRandom(const Campaign *campaign);
 
 void CampaignAndMissionSetup(
-	CampaignOptions *campaign, struct MissionOptions *mo);
+	Campaign *campaign, struct MissionOptions *mo);

src/cdogs/gamedata.c

@@ -69,7 +69,7 @@
 #include "sys_config.h"
 #include "utils.h"
 
-CampaignOptions gCampaign;
+Campaign gCampaign;
 
 struct MissionOptions gMission;
 
@@ -77,7 +77,7 @@ struct SongDef *gGameSongs = NULL;
 struct SongDef *gMenuSongs = NULL;
 
 
-bool CampaignLoad(CampaignOptions *co, CampaignEntry *entry)
+bool CampaignLoad(Campaign *co, CampaignEntry *entry)
 {
 	CASSERT(!co->IsLoaded, "loading campaign without unloading last one");
 	// Note: use the mode already set by the menus
@@ -112,7 +112,7 @@ bool CampaignLoad(CampaignOptions *co, CampaignEntry *entry)
 	}
 	return co->IsLoaded;
 }
-void CampaignUnload(CampaignOptions *co)
+void CampaignUnload(Campaign *co)
 {
 	co->IsLoaded = false;
 	co->IsClient = false;	// TODO: select is client from menu

src/cdogs/gamedata.h

@@ -67,8 +67,8 @@
 
 extern struct MissionOptions gMission;
 
-bool CampaignLoad(CampaignOptions *co, CampaignEntry *entry);
-void CampaignUnload(CampaignOptions *co);
+bool CampaignLoad(Campaign *co, CampaignEntry *entry);
+void CampaignUnload(Campaign *co);
 
 void MissionOptionsInit(struct MissionOptions *mo);
 void MissionOptionsTerminate(struct MissionOptions *mo);

src/cdogs/grafx_bg.c

@@ -44,7 +44,7 @@
 
 void GrafxMakeRandomBackground(
 	GraphicsDevice *device,
-	CampaignOptions *co, struct MissionOptions *mo, Map *map)
+	Campaign *co, struct MissionOptions *mo, Map *map)
 {
 	CampaignSettingInit(&co->Setting);
 	SetupQuickPlayCampaign(&co->Setting);
@@ -138,7 +138,7 @@ void GrafxRedrawBackground(GraphicsDevice *g, const struct vec2 pos)
 
 void GrafxMakeBackground(
 	GraphicsDevice *device, DrawBuffer *buffer,
-	CampaignOptions *co, struct MissionOptions *mo, Map *map, HSV tint,
+	Campaign *co, struct MissionOptions *mo, Map *map, HSV tint,
 	const bool isEditor, struct vec2 pos, GrafxDrawExtra *extra)
 {
 	CampaignAndMissionSetup(co, mo);

src/cdogs/grafx_bg.h

@@ -42,10 +42,10 @@ void GrafxDrawBackground(
 	const struct vec2 pos, GrafxDrawExtra *extra);
 void GrafxRedrawBackground(GraphicsDevice *g, const struct vec2 pos);
 void GrafxMakeBackground(
-	GraphicsDevice *device, DrawBuffer *buffer, CampaignOptions *co,
+	GraphicsDevice *device, DrawBuffer *buffer, Campaign *co,
 	struct MissionOptions *mo, Map *map, HSV tint, const bool isEditor,
 	struct vec2 pos, GrafxDrawExtra *extra);
 
 void GrafxMakeRandomBackground(
-	GraphicsDevice *device, CampaignOptions *co, struct MissionOptions *mo,
+	GraphicsDevice *device, Campaign *co, struct MissionOptions *mo,
 	Map *map);

src/cdogs/map_build.c

@@ -65,7 +65,7 @@
 static void MapSetupTilesAndWalls(MapBuilder *mb);
 static void MapSetupDoors(MapBuilder *mb);
 static void MapAddDrains(MapBuilder *mb);
-void MapBuild(Map *m, const Mission *mission, const CampaignOptions *co)
+void MapBuild(Map *m, const Mission *mission, const Campaign *co)
 {
 	MapBuilder mb;
 	MapBuilderInit(&mb, m, mission, co);
@@ -195,7 +195,7 @@ static int MapGetAccessFlags(const MapBuilder *mb, const struct vec2i v)
 }
 
 void MapBuilderInit(
-	MapBuilder *mb, Map *m, const Mission *mission, const CampaignOptions *co)
+	MapBuilder *mb, Map *m, const Mission *mission, const Campaign *co)
 {
 	memset(mb, 0, sizeof *mb);
 	mb->Map = m;

src/cdogs/map_build.h

@@ -55,7 +55,7 @@ typedef struct
 {
 	Map *Map;
 	const Mission *mission;
-	const CampaignOptions *co;
+	const Campaign *co;
 
 	// internal data structures to help build the map
 	CArray access;	  // of uint16_t
@@ -63,9 +63,9 @@ typedef struct
 	CArray leaveFree; // of bool
 } MapBuilder;
 
-void MapBuild(Map *m, const Mission *mission, const CampaignOptions *co);
+void MapBuild(Map *m, const Mission *mission, const Campaign *co);
 void MapBuilderInit(
-	MapBuilder *mb, Map *m, const Mission *mission, const CampaignOptions *co);
+	MapBuilder *mb, Map *m, const Mission *mission, const Campaign *co);
 void MapBuilderTerminate(MapBuilder *mb);
 
 void MapLoadDynamic(MapBuilder *mb);

src/cdogs/net_util.c

@@ -81,7 +81,7 @@ NPlayerData NMakePlayerData(const PlayerData *p)
 	Ammo2Net(&d.Ammo_count, d.Ammo, &p->ammo);
 	return d;
 }
-NCampaignDef NMakeCampaignDef(const CampaignOptions *co)
+NCampaignDef NMakeCampaignDef(const Campaign *co)
 {
 	NCampaignDef def;
 	memset(&def, 0, sizeof def);

src/cdogs/net_util.h

@@ -51,7 +51,7 @@ ENetPacket *NetEncode(const GameEventType e, const void *data);
 bool NetDecode(ENetPacket *packet, void *dest, const pb_msgdesc_t *fields);
 
 NPlayerData NMakePlayerData(const PlayerData *p);
-NCampaignDef NMakeCampaignDef(const CampaignOptions *co);
+NCampaignDef NMakeCampaignDef(const Campaign *co);
 NMissionComplete NMakeMissionComplete(
 	const struct MissionOptions *mo, const Map *map);
 

src/cdogsed/editor_ui.c

@@ -56,41 +56,41 @@ static void DrawStyleArea(
 static char *CampaignGetTitle(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return co->Setting.Title;
 }
 static char **CampaignGetTitleSrc(void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return &co->Setting.Title;
 }
 static char *CampaignGetAuthor(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return co->Setting.Author;
 }
 static char **CampaignGetAuthorSrc(void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return &co->Setting.Author;
 }
 static char *CampaignGetDescription(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return co->Setting.Description;
 }
 static char **CampaignGetDescriptionSrc(void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	return &co->Setting.Description;
 }
 static const char *CampaignGetMissionIndexStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *mission = CampaignGetCurrentMission(co);
 	if (mission == NULL)
 	{
@@ -110,7 +110,7 @@ static const char *CampaignGetMissionIndexStr(UIObject *o, void *data)
 }
 static void CheckMission(UIObject *o, void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		o->IsVisible = false;
@@ -124,7 +124,7 @@ MISSION_CHECK_TYPE_FUNC(MAPTYPE_CLASSIC)
 static char *MissionGetTitle(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		return NULL;
@@ -133,12 +133,12 @@ static char *MissionGetTitle(UIObject *o, void *data)
 }
 static void MissionCheckVisible(UIObject *o, void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	o->IsVisible = CampaignGetCurrentMission(co) != NULL;
 }
 static char **MissionGetTitleSrc(void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		return NULL;
@@ -148,7 +148,7 @@ static char **MissionGetTitleSrc(void *data)
 static char *MissionGetDescription(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		return NULL;
@@ -157,7 +157,7 @@ static char *MissionGetDescription(UIObject *o, void *data)
 }
 static char **MissionGetDescriptionSrc(void *data)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		return NULL;
@@ -167,7 +167,7 @@ static char **MissionGetDescriptionSrc(void *data)
 static char *MissionGetSong(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 	{
 		return NULL;
@@ -178,7 +178,7 @@ static const char *MissionGetWidthStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Width: %d", CampaignGetCurrentMission(co)->Size.x);
@@ -188,7 +188,7 @@ static const char *MissionGetHeightStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Height: %d", CampaignGetCurrentMission(co)->Size.y);
@@ -198,7 +198,7 @@ static const char *MissionGetWallCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Walls: %d", CampaignGetCurrentMission(co)->u.Classic.Walls);
@@ -208,7 +208,7 @@ static const char *MissionGetWallLengthStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Len: %d", CampaignGetCurrentMission(co)->u.Classic.WallLength);
@@ -218,7 +218,7 @@ static const char *MissionGetCorridorWidthStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -230,7 +230,7 @@ static const char *MissionGetRoomCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -241,7 +241,7 @@ static const char *MissionGetRoomMinStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -252,7 +252,7 @@ static const char *MissionGetRoomMaxStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -264,7 +264,7 @@ static void MissionDrawEdgeRooms(
 {
 	UNUSED(o);
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return;
 	DisplayFlag(
@@ -278,7 +278,7 @@ static void MissionDrawRoomsOverlap(
 	UNUSED(o);
 	UNUSED(g);
 	UNUSED(pos);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return;
 	DisplayFlag(
@@ -290,7 +290,7 @@ static const char *MissionGetRoomWallCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -302,7 +302,7 @@ static const char *MissionGetRoomWallLenStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -314,7 +314,7 @@ static const char *MissionGetRoomWallPadStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -326,7 +326,7 @@ static const char *MissionGetSquareCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Sqr: %d", CampaignGetCurrentMission(co)->u.Classic.Squares);
@@ -337,7 +337,7 @@ static void MissionDrawDoorEnabled(
 {
 	UNUSED(o);
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return;
 	DisplayFlag(
@@ -349,7 +349,7 @@ static const char *MissionGetDoorMinStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -360,7 +360,7 @@ static const char *MissionGetDoorMaxStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -371,7 +371,7 @@ static const char *MissionGetPillarCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -383,7 +383,7 @@ static const char *MissionGetPillarMinStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -395,7 +395,7 @@ static const char *MissionGetPillarMaxStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -407,7 +407,7 @@ static const char *MissionGetDensityStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Dens: %d", CampaignGetCurrentMission(co)->EnemyDensity);
@@ -417,7 +417,7 @@ static const char *MissionGetTypeStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Type: %s", MapTypeStr(CampaignGetCurrentMission(co)->Type));
@@ -439,7 +439,7 @@ static void MissionDrawWallStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (!m)
 		return;
@@ -457,7 +457,7 @@ static void MissionDrawFloorStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (!m)
 		return;
@@ -475,7 +475,7 @@ static void MissionDrawRoomStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (!m)
 		return;
@@ -493,7 +493,7 @@ static void MissionDrawDoorStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (!m)
 		return;
@@ -511,7 +511,7 @@ static void MissionDrawKeyStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL)
 	{
@@ -527,7 +527,7 @@ static void MissionDrawExitStyle(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data)
 {
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL)
 	{
@@ -544,7 +544,7 @@ static const char *MissionGetCharacterCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -556,7 +556,7 @@ static const char *MissionGetSpecialCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(
@@ -609,7 +609,7 @@ static const char *GetObjectCountStr(UIObject *o, void *v)
 }
 typedef struct
 {
-	CampaignOptions *co;
+	Campaign *co;
 	int index;
 } MissionIndexData;
 static void MissionDrawEnemy(
@@ -683,7 +683,7 @@ static void DrawStyleArea(
 
 static EditorResult CampaignChangeMission(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	co->MissionIndex =
 		CLAMP(co->MissionIndex + d, 0, (int)co->Setting.Missions.size);
 	return EDITOR_RESULT_RELOAD;
@@ -691,14 +691,14 @@ static EditorResult CampaignChangeMission(void *data, int d)
 static EditorResult MissionInsertNew(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	InsertMission(co, NULL, co->MissionIndex);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionDelete(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (co->Setting.Missions.size > 0 &&
 		ConfirmScreen("", "Delete mission? (Y/N)"))
 	{
@@ -709,7 +709,7 @@ static EditorResult MissionDelete(void *data, int d)
 }
 static EditorResult MissionChangeWidth(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	int old = m->Size.x;
 	if (gEventHandlers.keyboard.modState & KMOD_SHIFT)
@@ -725,7 +725,7 @@ static EditorResult MissionChangeWidth(void *data, int d)
 }
 static EditorResult MissionChangeHeight(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	int old = m->Size.y;
 	if (gEventHandlers.keyboard.modState & KMOD_SHIFT)
@@ -741,35 +741,35 @@ static EditorResult MissionChangeHeight(void *data, int d)
 }
 static EditorResult MissionChangeWallCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Walls =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Walls + d, 0, 200);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeWallLength(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.WallLength =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.WallLength + d, 1, 100);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeCorridorWidth(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.CorridorWidth = CLAMP(
 		CampaignGetCurrentMission(co)->u.Classic.CorridorWidth + d, 1, 5);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Count = CLAMP(
 		CampaignGetCurrentMission(co)->u.Classic.Rooms.Count + d, 0, 100);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomMin(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Min =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Rooms.Min + d, 5, 50);
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Max =
@@ -779,7 +779,7 @@ static EditorResult MissionChangeRoomMin(void *data, int d)
 }
 static EditorResult MissionChangeRoomMax(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Max =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Rooms.Max + d, 5, 50);
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Min =
@@ -790,7 +790,7 @@ static EditorResult MissionChangeRoomMax(void *data, int d)
 static EditorResult MissionChangeEdgeRooms(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Edge =
 		!CampaignGetCurrentMission(co)->u.Classic.Rooms.Edge;
 	return EDITOR_RESULT_CHANGED;
@@ -798,35 +798,35 @@ static EditorResult MissionChangeEdgeRooms(void *data, int d)
 static EditorResult MissionChangeRoomsOverlap(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Overlap =
 		!CampaignGetCurrentMission(co)->u.Classic.Rooms.Overlap;
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomWallCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.Walls =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Rooms.Walls + d, 0, 50);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomWallLen(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.WallLength = CLAMP(
 		CampaignGetCurrentMission(co)->u.Classic.Rooms.WallLength + d, 1, 50);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomWallPad(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Rooms.WallPad = CLAMP(
 		CampaignGetCurrentMission(co)->u.Classic.Rooms.WallPad + d, 1, 10);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeSquareCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Squares =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Squares + d, 0, 100);
 	return EDITOR_RESULT_CHANGED;
@@ -834,14 +834,14 @@ static EditorResult MissionChangeSquareCount(void *data, int d)
 static EditorResult MissionChangeDoorEnabled(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Doors.Enabled =
 		!CampaignGetCurrentMission(co)->u.Classic.Doors.Enabled;
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeDoorMin(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Doors.Min =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Doors.Min + d, 1, 6);
 	CampaignGetCurrentMission(co)->u.Classic.Doors.Max =
@@ -851,7 +851,7 @@ static EditorResult MissionChangeDoorMin(void *data, int d)
 }
 static EditorResult MissionChangeDoorMax(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Doors.Max =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Doors.Max + d, 1, 6);
 	CampaignGetCurrentMission(co)->u.Classic.Doors.Min =
@@ -861,14 +861,14 @@ static EditorResult MissionChangeDoorMax(void *data, int d)
 }
 static EditorResult MissionChangePillarCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Pillars.Count = CLAMP(
 		CampaignGetCurrentMission(co)->u.Classic.Pillars.Count + d, 0, 50);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangePillarMin(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Pillars.Min =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Pillars.Min + d, 1, 50);
 	CampaignGetCurrentMission(co)->u.Classic.Pillars.Max =
@@ -878,7 +878,7 @@ static EditorResult MissionChangePillarMin(void *data, int d)
 }
 static EditorResult MissionChangePillarMax(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Classic.Pillars.Max =
 		CLAMP(CampaignGetCurrentMission(co)->u.Classic.Pillars.Max + d, 1, 50);
 	CampaignGetCurrentMission(co)->u.Classic.Pillars.Min =
@@ -888,14 +888,14 @@ static EditorResult MissionChangePillarMax(void *data, int d)
 }
 static EditorResult MissionChangeDensity(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->EnemyDensity =
 		CLAMP(CampaignGetCurrentMission(co)->EnemyDensity + d, 0, 100);
 	return EDITOR_RESULT_CHANGED;
 }
 typedef struct
 {
-	CampaignOptions *C;
+	Campaign *C;
 	MapType Type;
 } MissionChangeTypeData;
 static EditorResult MissionChangeType(void *data, int d)
@@ -917,7 +917,7 @@ static EditorResult MissionChangeType(void *data, int d)
 }
 static EditorResult MissionChangeWallStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	TileClass *tc = m->Type == MAPTYPE_CLASSIC ? &m->u.Classic.TileClasses.Wall
 											   : &m->u.Cave.TileClasses.Wall;
@@ -931,7 +931,7 @@ static EditorResult MissionChangeWallStyle(void *data, int d)
 }
 static EditorResult MissionChangeFloorStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	TileClass *tc = m->Type == MAPTYPE_CLASSIC
 						? &m->u.Classic.TileClasses.Floor
@@ -946,7 +946,7 @@ static EditorResult MissionChangeFloorStyle(void *data, int d)
 }
 static EditorResult MissionChangeRoomStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	TileClass *tc = m->Type == MAPTYPE_CLASSIC ? &m->u.Classic.TileClasses.Room
 											   : &m->u.Cave.TileClasses.Room;
@@ -960,7 +960,7 @@ static EditorResult MissionChangeRoomStyle(void *data, int d)
 }
 static EditorResult MissionChangeDoorStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	TileClass *tc = m->Type == MAPTYPE_CLASSIC ? &m->u.Classic.TileClasses.Door
 											   : &m->u.Cave.TileClasses.Door;
@@ -974,7 +974,7 @@ static EditorResult MissionChangeDoorStyle(void *data, int d)
 }
 static EditorResult MissionChangeKeyStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	const int idx = CLAMP_OPPOSITE(
 		PicManagerGetKeyStyleIndex(&gPicManager, m->KeyStyle) + d, 0,
@@ -984,7 +984,7 @@ static EditorResult MissionChangeKeyStyle(void *data, int d)
 }
 static EditorResult MissionChangeExitStyle(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	const int idx = CLAMP_OPPOSITE(
 		PicManagerGetExitStyleIndex(&gPicManager, m->ExitStyle) + d, 0,
@@ -1029,12 +1029,12 @@ static void DeactivateBrush(UIObject *o, void *data)
 	b->IsActive = false;
 }
 
-static UIObject *CreateCampaignObjs(CampaignOptions *co);
-static UIObject *CreateMissionObjs(CampaignOptions *co);
-static UIObject *CreateClassicMapObjs(struct vec2i pos, CampaignOptions *co);
-static UIObject *CreateMapItemObjs(CampaignOptions *co, int dy);
-static UIObject *CreateCharacterObjs(CampaignOptions *co, int dy);
-static UIObject *CreateSpecialCharacterObjs(CampaignOptions *co, int dy);
+static UIObject *CreateCampaignObjs(Campaign *co);
+static UIObject *CreateMissionObjs(Campaign *co);
+static UIObject *CreateClassicMapObjs(struct vec2i pos, Campaign *co);
+static UIObject *CreateMapItemObjs(Campaign *co, int dy);
+static UIObject *CreateCharacterObjs(Campaign *co, int dy);
+static UIObject *CreateSpecialCharacterObjs(Campaign *co, int dy);
 
 typedef struct
 {
@@ -1049,9 +1049,9 @@ typedef struct
 static EditorResult ToggleCollapse(void *data, int d);
 static void DrawBackground(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data);
-static UIObject *CreateEditorObjs(CampaignOptions *co, EditorBrush *brush);
+static UIObject *CreateEditorObjs(Campaign *co, EditorBrush *brush);
 UIObject *CreateMainObjs(
-	CampaignOptions *co, EditorBrush *brush, struct vec2i size)
+	Campaign *co, EditorBrush *brush, struct vec2i size)
 {
 	UIObject *cc =
 		UIObjectCreate(UITYPE_NONE, 0, svec2i_zero(), svec2i_zero());
@@ -1123,7 +1123,7 @@ static void DrawBackground(
 	const color_t c = {32, 32, 64, 196};
 	DrawRectangle(g, pos, o->Size, c, true);
 }
-static UIObject *CreateEditorObjs(CampaignOptions *co, EditorBrush *brush)
+static UIObject *CreateEditorObjs(Campaign *co, EditorBrush *brush)
 {
 	const int th = FontH();
 	UIObject *c;
@@ -1402,7 +1402,7 @@ static UIObject *CreateEditorObjs(CampaignOptions *co, EditorBrush *brush)
 
 	return cc;
 }
-static UIObject *CreateCampaignObjs(CampaignOptions *co)
+static UIObject *CreateCampaignObjs(Campaign *co)
 {
 	const int th = FontH();
 	UIObject *c;
@@ -1444,7 +1444,7 @@ static UIObject *CreateCampaignObjs(CampaignOptions *co)
 	UIObjectDestroy(o);
 	return c;
 }
-static UIObject *CreateMissionObjs(CampaignOptions *co)
+static UIObject *CreateMissionObjs(Campaign *co)
 {
 	const int th = FontH();
 	UIObject *c;
@@ -1465,7 +1465,7 @@ static UIObject *CreateMissionObjs(CampaignOptions *co)
 
 	return c;
 }
-static UIObject *CreateClassicMapObjs(struct vec2i pos, CampaignOptions *co)
+static UIObject *CreateClassicMapObjs(struct vec2i pos, Campaign *co)
 {
 	const int th = FontH();
 	UIObject *c = UIObjectCreate(UITYPE_NONE, 0, svec2i_zero(), svec2i_zero());
@@ -1623,13 +1623,13 @@ static UIObject *CreateClassicMapObjs(struct vec2i pos, CampaignOptions *co)
 
 typedef struct
 {
-	CampaignOptions *C;
+	Campaign *C;
 	int Idx;
 	MapObject *M;
 } MapItemIndexData;
 static EditorResult MissionChangeMapItemDensity(void *vData, int d);
 static bool MapItemObjFunc(UIObject *o, MapObject *mo, void *vData);
-static UIObject *CreateMapItemObjs(CampaignOptions *co, int dy)
+static UIObject *CreateMapItemObjs(Campaign *co, int dy)
 {
 	UIObject *c = UIObjectCreate(UITYPE_NONE, 0, svec2i_zero(), svec2i_zero());
 	c->Flags = UI_ENABLED_WHEN_PARENT_HIGHLIGHTED_ONLY;
@@ -1722,7 +1722,7 @@ static void DrawMapItem(
 		colorWhite, 0, svec2_one(), SDL_FLIP_NONE, Rect2iZero());
 }
 
-static UIObject *CreateCharacterObjs(CampaignOptions *co, int dy)
+static UIObject *CreateCharacterObjs(Campaign *co, int dy)
 {
 	UIObject *c;
 	UIObject *o;
@@ -1751,7 +1751,7 @@ static UIObject *CreateCharacterObjs(CampaignOptions *co, int dy)
 	UIObjectDestroy(o);
 	return c;
 }
-static UIObject *CreateSpecialCharacterObjs(CampaignOptions *co, int dy)
+static UIObject *CreateSpecialCharacterObjs(Campaign *co, int dy)
 {
 	UIObject *c;
 	UIObject *o;

src/cdogsed/editor_ui.h

@@ -83,4 +83,4 @@
 #define XC_COLOR4           9
 
 
-UIObject *CreateMainObjs(CampaignOptions *co, EditorBrush *brush, struct vec2i size);
+UIObject *CreateMainObjs(Campaign *co, EditorBrush *brush, struct vec2i size);

src/cdogsed/editor_ui_cave.c

@@ -66,7 +66,7 @@ static EditorResult MissionChangeSquareCount(void *data, int d);
 static void MissionDrawDoorEnabled(
 	UIObject *o, GraphicsDevice *g, struct vec2i pos, void *data);
 static EditorResult MissionChangeDoorEnabled(void *data, int d);
-UIObject *CreateCaveMapObjs(struct vec2i pos, CampaignOptions *co)
+UIObject *CreateCaveMapObjs(struct vec2i pos, Campaign *co)
 {
 	const int th = FontH();
 	UIObject *c = UIObjectCreate(UITYPE_NONE, 0, svec2i_zero(), svec2i_zero());
@@ -196,7 +196,7 @@ UIObject *CreateCaveMapObjs(struct vec2i pos, CampaignOptions *co)
 static const char *MissionGetFillPercentStr(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL) return NULL;
 	static char s[128];
@@ -205,7 +205,7 @@ static const char *MissionGetFillPercentStr(UIObject *o, void *data)
 }
 static EditorResult MissionChangeFillPercent(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	if (gEventHandlers.keyboard.modState & KMOD_SHIFT)
 	{
@@ -217,7 +217,7 @@ static EditorResult MissionChangeFillPercent(void *data, int d)
 static const char *MissionGetRepeatStr(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL) return NULL;
 	static char s[128];
@@ -226,7 +226,7 @@ static const char *MissionGetRepeatStr(UIObject *o, void *data)
 }
 static EditorResult MissionChangeRepeat(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	m->u.Cave.Repeat = CLAMP(m->u.Cave.Repeat + d, 0, 10);
 	return EDITOR_RESULT_CHANGED;
@@ -234,7 +234,7 @@ static EditorResult MissionChangeRepeat(void *data, int d)
 static const char *MissionGetR1Str(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL) return NULL;
 	static char s[128];
@@ -243,7 +243,7 @@ static const char *MissionGetR1Str(UIObject *o, void *data)
 }
 static EditorResult MissionChangeR1(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	m->u.Cave.R1 = CLAMP(m->u.Cave.R1 + d, 0, 8);
 	return EDITOR_RESULT_CHANGED;
@@ -251,7 +251,7 @@ static EditorResult MissionChangeR1(void *data, int d)
 static const char *MissionGetR2Str(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL) return NULL;
 	static char s[128];
@@ -260,7 +260,7 @@ static const char *MissionGetR2Str(UIObject *o, void *data)
 }
 static EditorResult MissionChangeR2(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	m->u.Cave.R2 = CLAMP(m->u.Cave.R2 + d, -1, 25);
 	return EDITOR_RESULT_CHANGED;
@@ -268,7 +268,7 @@ static EditorResult MissionChangeR2(void *data, int d)
 static const char *MissionGetCorridorWidthStr(UIObject *o, void *data)
 {
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	const Mission *m = CampaignGetCurrentMission(co);
 	if (m == NULL) return NULL;
 	static char s[128];
@@ -277,7 +277,7 @@ static const char *MissionGetCorridorWidthStr(UIObject *o, void *data)
 }
 static EditorResult MissionChangeCorridorWidth(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	m->u.Cave.CorridorWidth = CLAMP(m->u.Cave.CorridorWidth + d, 1, 5);
 	return EDITOR_RESULT_CHANGED;
@@ -286,7 +286,7 @@ static const char *MissionGetRoomCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(
 		s, "Rooms: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.Count);
@@ -296,7 +296,7 @@ static const char *MissionGetRoomMinStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "RoomMin: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.Min);
 	return s;
@@ -305,21 +305,21 @@ static const char *MissionGetRoomMaxStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "RoomMax: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.Max);
 	return s;
 }
 static EditorResult MissionChangeRoomCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Count =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Rooms.Count + d, 0, 100);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomMin(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Min =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Rooms.Min + d, 5, 50);
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Max = MAX(
@@ -329,7 +329,7 @@ static EditorResult MissionChangeRoomMin(void *data, int d)
 }
 static EditorResult MissionChangeRoomMax(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Max =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Rooms.Max + d, 5, 50);
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Min = MIN(
@@ -343,7 +343,7 @@ static void MissionDrawRoomsOverlap(
 	UNUSED(o);
 	UNUSED(g);
 	UNUSED(pos);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return;
 	DisplayFlag(
 		svec2i_add(pos, o->Pos), "Room overlap",
@@ -353,7 +353,7 @@ static void MissionDrawRoomsOverlap(
 static EditorResult MissionChangeRoomsOverlap(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Overlap =
 		!CampaignGetCurrentMission(co)->u.Cave.Rooms.Overlap;
 	return EDITOR_RESULT_CHANGED;
@@ -362,7 +362,7 @@ static const char *MissionGetRoomWallCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "RoomWalls: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.Walls);
 	return s;
@@ -371,7 +371,7 @@ static const char *MissionGetRoomWallLenStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "RoomWallLen: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.WallLength);
 	return s;
@@ -380,28 +380,28 @@ static const char *MissionGetRoomWallPadStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "RoomWallPad: %d", CampaignGetCurrentMission(co)->u.Cave.Rooms.WallPad);
 	return s;
 }
 static EditorResult MissionChangeRoomWallCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.Walls =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Rooms.Walls + d, 0, 50);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomWallLen(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.WallLength = CLAMP(
 		CampaignGetCurrentMission(co)->u.Cave.Rooms.WallLength + d, 1, 50);
 	return EDITOR_RESULT_CHANGED;
 }
 static EditorResult MissionChangeRoomWallPad(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Rooms.WallPad =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Rooms.WallPad + d, 1, 10);
 	return EDITOR_RESULT_CHANGED;
@@ -410,14 +410,14 @@ static const char *MissionGetSquareCountStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return NULL;
 	sprintf(s, "Sqr: %d", CampaignGetCurrentMission(co)->u.Cave.Squares);
 	return s;
 }
 static EditorResult MissionChangeSquareCount(void *data, int d)
 {
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	CampaignGetCurrentMission(co)->u.Cave.Squares =
 		CLAMP(CampaignGetCurrentMission(co)->u.Cave.Squares + d, 0, 100);
 	return EDITOR_RESULT_CHANGED;
@@ -427,7 +427,7 @@ static void MissionDrawDoorEnabled(
 {
 	UNUSED(o);
 	UNUSED(g);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co)) return;
 	DisplayFlag(
 		svec2i_add(pos, o->Pos), "Doors",
@@ -437,7 +437,7 @@ static void MissionDrawDoorEnabled(
 static EditorResult MissionChangeDoorEnabled(void *data, int d)
 {
 	UNUSED(d);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	Mission *m = CampaignGetCurrentMission(co);
 	m->u.Cave.DoorsEnabled = !m->u.Cave.DoorsEnabled;
 	return EDITOR_RESULT_CHANGED;

src/cdogsed/editor_ui_cave.h

@@ -32,4 +32,4 @@
 #include "editor_brush.h"
 #include "ui_object.h"
 
-UIObject *CreateCaveMapObjs(struct vec2i pos, CampaignOptions *co);
+UIObject *CreateCaveMapObjs(struct vec2i pos, Campaign *co);

src/cdogsed/editor_ui_color.c

@@ -182,14 +182,14 @@ typedef enum
 } MissionColorType;
 typedef struct
 {
-	CampaignOptions *C;
+	Campaign *C;
 	MissionColorType Type;
 } MissionColorData;
 static const char *MissionGetColorStr(UIObject *o, void *data);
 static void MissionColorChange(const color_t c, void *data);
 static color_t CampaignGetMissionColor(void *data);
 struct vec2i CreateColorObjs(
-	CampaignOptions *co, UIObject *c, struct vec2i pos)
+	Campaign *co, UIObject *c, struct vec2i pos)
 {
 	const int th = FontH();
 

src/cdogsed/editor_ui_color.h

@@ -38,4 +38,4 @@ UIObject *CreateColorPicker(
 	const struct vec2i pos, void *data,
 	ColorPickerGetFunc getFunc, ColorPickerChangeFunc changeFunc);
 
-struct vec2i CreateColorObjs(CampaignOptions *co, UIObject *c, struct vec2i pos);
+struct vec2i CreateColorObjs(Campaign *co, UIObject *c, struct vec2i pos);

src/cdogsed/editor_ui_common.c

@@ -76,7 +76,7 @@ void DrawKey(UIObject *o, GraphicsDevice *g, struct vec2i pos, void *vData)
 		SDL_FLIP_NONE, Rect2iZero());
 }
 
-void InsertMission(CampaignOptions *co, Mission *mission, int idx)
+void InsertMission(Campaign *co, Mission *mission, int idx)
 {
 	Mission m;
 	if (mission == NULL)
@@ -98,7 +98,7 @@ void InsertMission(CampaignOptions *co, Mission *mission, int idx)
 	}
 	CArrayInsert(&co->Setting.Missions, idx, &m);
 }
-void DeleteMission(CampaignOptions *co)
+void DeleteMission(Campaign *co)
 {
 	CASSERT(
 		co->MissionIndex < (int)co->Setting.Missions.size,
@@ -158,7 +158,7 @@ void DisplayFlag(
 
 static const char *CampaignGetSeedStr(UIObject *o, void *data);
 static EditorResult CampaignChangeSeed(void *data, int d);
-UIObject *CreateCampaignSeedObj(const struct vec2i pos, CampaignOptions *co)
+UIObject *CreateCampaignSeedObj(const struct vec2i pos, Campaign *co)
 {
 	const int th = FontH();
 	UIObject *o =
@@ -174,7 +174,7 @@ static const char *CampaignGetSeedStr(UIObject *o, void *data)
 {
 	static char s[128];
 	UNUSED(o);
-	CampaignOptions *co = data;
+	Campaign *co = data;
 	if (!CampaignGetCurrentMission(co))
 		return NULL;
 	sprintf(s, "Seed: %d", ConfigGetInt(&gConfig, "Game.RandomSeed"));

src/cdogsed/editor_ui_common.h

@@ -47,7 +47,7 @@ typedef struct
 typedef struct
 {
 	IndexedEditorBrush Brush;
-	CampaignOptions *Campaign;
+	Campaign *Campaign;
 } EditorBrushAndCampaign;
 
 void DisplayMapItem(const struct vec2i pos, const MapObject *mo);
@@ -55,8 +55,8 @@ void DisplayMapItemWithDensity(
 	const struct vec2i pos, const MapObjectDensity *mod, const bool isHighlighted);
 void DrawKey(UIObject *o, GraphicsDevice *g, struct vec2i pos, void *vData);
 
-void InsertMission(CampaignOptions *co, Mission *mission, int idx);
-void DeleteMission(CampaignOptions *co);
+void InsertMission(Campaign *co, Mission *mission, int idx);
+void DeleteMission(Campaign *co);
 
 bool ConfirmScreen(const char *info, const char *msg);
 void ClearScreen(GraphicsDevice *g);
@@ -64,7 +64,7 @@ void ClearScreen(GraphicsDevice *g);
 void DisplayFlag(
 	const struct vec2i pos, const char *s, const bool isOn, const bool isHighlighted);
 
-UIObject *CreateCampaignSeedObj(const struct vec2i pos, CampaignOptions *co);
+UIObject *CreateCampaignSeedObj(const struct vec2i pos, Campaign *co);
 UIObject *CreateAddMapItemObjs(
 	const struct vec2i pos, bool (*objFunc)(UIObject *, MapObject *, void *),
 	void *data, const size_t dataSize, const bool expandDown);
@@ -82,7 +82,7 @@ void CreateCloseLabel(UIObject *c, const struct vec2i pos);
 #define MISSION_CHECK_TYPE_FUNC(_type)\
 static void MissionCheckTypeFunc(UIObject *o, void *data)\
 {\
-	CampaignOptions *co = data;\
+	Campaign *co = data;\
 	const Mission *m = CampaignGetCurrentMission(co);\
 	if (!m || m->Type != (_type))\
 	{\

src/cdogsed/editor_ui_objectives.c

@@ -36,7 +36,7 @@
 
 typedef struct
 {
-	CampaignOptions *Campaign;
+	Campaign *Campaign;
 	int MissionObjectiveIndex;
 } MissionObjectiveData;
 static char *MissionGetObjectiveDescription(UIObject *o, void *data)
@@ -101,7 +101,7 @@ static char **MissionGetObjectiveDescriptionSrc(void *data)
 }
 typedef struct
 {
-	CampaignOptions *co;
+	Campaign *co;
 	int index;
 } MissionIndexData;
 static const char *MissionGetObjectiveStr(UIObject *o, void *vData)
@@ -189,7 +189,7 @@ static const char *MissionGetObjectiveFlags(UIObject *o, void *vData)
 
 typedef struct
 {
-	CampaignOptions *C;
+	Campaign *C;
 	int ObjectiveIdx;
 	ObjectiveType Type;
 } ObjectiveChangeTypeData;
@@ -265,8 +265,8 @@ static EditorResult MissionChangeObjectiveFlags(void *vData, int d)
 }
 
 static UIObject *CreateObjectiveObjs(
-	struct vec2i pos, CampaignOptions *co, const int idx);
-void CreateObjectivesObjs(CampaignOptions *co, UIObject *c, struct vec2i pos)
+	struct vec2i pos, Campaign *co, const int idx);
+void CreateObjectivesObjs(Campaign *co, UIObject *c, struct vec2i pos)
 {
 	const int th = FontH();
 	struct vec2i objectivesPos = svec2i(0, 7 * th);
@@ -297,9 +297,9 @@ void CreateObjectivesObjs(CampaignOptions *co, UIObject *c, struct vec2i pos)
 	UIObjectDestroy(o);
 }
 static void CreateObjectiveItemObjs(
-	UIObject *c, const struct vec2i pos, CampaignOptions *co, const int idx);
+	UIObject *c, const struct vec2i pos, Campaign *co, const int idx);
 static UIObject *CreateObjectiveObjs(
-	struct vec2i pos, CampaignOptions *co, const int idx)
+	struct vec2i pos, Campaign *co, const int idx)
 {
 	const int th = FontH();
 	UIObject *c;
@@ -394,7 +394,7 @@ static UIObject *CreateObjectiveObjs(
 
 typedef struct
 {
-	CampaignOptions *C;
+	Campaign *C;
 	int ObjIdx;
 	MapObject *M;
 } DestroyObjectiveData;
@@ -414,7 +414,7 @@ static void MissionCheckObjectiveIsDestroy(UIObject *o, void *vData);
 static void MissionCheckObjectiveIsRescue(UIObject *o, void *vData);
 static bool ObjectiveDestroyObjFunc(UIObject *o, MapObject *mo, void *data);
 static void CreateObjectiveItemObjs(
-	UIObject *c, const struct vec2i pos, CampaignOptions *co, const int idx)
+	UIObject *c, const struct vec2i pos, Campaign *co, const int idx)
 {
 	// TODO: context menu
 	UIObject *o = UIObjectCreate(UITYPE_CUSTOM, 0, pos, svec2i(30, 20));

src/cdogsed/editor_ui_objectives.h

@@ -32,4 +32,4 @@
 #include <cdogs/gamedata.h>
 
 
-void CreateObjectivesObjs(CampaignOptions *co, UIObject *c, struct vec2i pos);
+void CreateObjectivesObjs(Campaign *co, UIObject *c, struct vec2i pos);

src/cdogsed/editor_ui_static.c

@@ -301,7 +301,7 @@ static bool DeactivateIndexedEditorBrush(void *data)
 
 static UIObject *CreateSetKeyObjs(struct vec2i pos, EditorBrush *brush);
 UIObject *CreateStaticMapObjs(
-	struct vec2i pos, CampaignOptions *co, EditorBrush *brush)
+	struct vec2i pos, Campaign *co, EditorBrush *brush)
 {
 	int x = pos.x;
 	const int th = FontH();

src/cdogsed/editor_ui_static.h

@@ -34,6 +34,6 @@
 #include "ui_object.h"
 
 UIObject *CreateStaticMapObjs(
-	struct vec2i pos, CampaignOptions *co, EditorBrush *brush);
+	struct vec2i pos, Campaign *co, EditorBrush *brush);
 
 #endif

src/cdogsed/editor_ui_static_additem.c

@@ -196,12 +196,12 @@ static bool AddMapItemBrushObjFunc(UIObject *o, MapObject *mo, void *vData);
 static bool AddPickupSpawnerBrushObjFunc(
 	UIObject *o, MapObject *mo, void *vData);
 static UIObject *CreateAddCharacterObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co);
+	struct vec2i pos, EditorBrush *brush, Campaign *co);
 static UIObject *CreateAddObjectiveObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co);
+	struct vec2i pos, EditorBrush *brush, Campaign *co);
 static UIObject *CreateAddKeyObjs(struct vec2i pos, EditorBrush *brush);
 UIObject *CreateAddItemObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co)
+	struct vec2i pos, EditorBrush *brush, Campaign *co)
 {
 	const int th = FontH();
 	UIObject *o2;
@@ -341,7 +341,7 @@ static char *MakePickupTooltip(const MapObject *mo)
 }
 static void CreateAddCharacterSubObjs(UIObject *c, void *vData);
 static UIObject *CreateAddCharacterObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co)
+	struct vec2i pos, EditorBrush *brush, Campaign *co)
 {
 	UIObject *c = UIObjectCreate(UITYPE_CONTEXT_MENU, 0, pos, svec2i_zero());
 	// Need to update UI objects dynamically as new characters can be
@@ -404,7 +404,7 @@ static void CreateAddCharacterSubObjs(UIObject *c, void *vData)
 }
 static void CreateAddObjectiveSubObjs(UIObject *c, void *vData);
 static UIObject *CreateAddObjectiveObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co)
+	struct vec2i pos, EditorBrush *brush, Campaign *co)
 {
 	UIObject *c = UIObjectCreate(UITYPE_CONTEXT_MENU, 0, pos, svec2i_zero());
 	// Need to update UI objects dynamically as new objectives can be

src/cdogsed/editor_ui_static_additem.h

@@ -34,6 +34,6 @@
 #include "ui_object.h"
 
 UIObject *CreateAddItemObjs(
-	struct vec2i pos, EditorBrush *brush, CampaignOptions *co);
+	struct vec2i pos, EditorBrush *brush, Campaign *co);
 
 #endif

src/cdogsed/editor_ui_weapons.c

@@ -39,7 +39,7 @@ typedef enum
 } SelectMode;
 typedef struct
 {
-	CampaignOptions *co;
+	Campaign *co;
 	SelectMode Mode;
 } MissionAllGunsData;
 static bool HasWeapon(const Mission *m, const WeaponClass *wc);
@@ -95,7 +95,7 @@ static void AddAllWeapons(Mission *m)
 
 typedef struct
 {
-	CampaignOptions *co;
+	Campaign *co;
 	const WeaponClass *Gun;
 } MissionGunData;
 static void MissionDrawWeaponStatus(
@@ -152,12 +152,12 @@ static bool HasWeapon(const Mission *m, const WeaponClass *wc)
 #define COLUMN_WIDTH 90
 
 static void CreateWeaponSpecialToggleObj(
-	CampaignOptions *co, UIObject *c, const struct vec2i pos,
+	Campaign *co, UIObject *c, const struct vec2i pos,
 	const SelectMode mode, char *label);
 static void CreateWeaponToggleObjs(
-	CampaignOptions *co, UIObject *c, const UIObject *o, int *idx,
+	Campaign *co, UIObject *c, const UIObject *o, int *idx,
 	const int rows, CArray *guns);
-UIObject *CreateWeaponObjs(CampaignOptions *co)
+UIObject *CreateWeaponObjs(Campaign *co)
 {
 	const int th = FontH();
 	UIObject *c =
@@ -191,7 +191,7 @@ UIObject *CreateWeaponObjs(CampaignOptions *co)
 	return c;
 }
 static void CreateWeaponSpecialToggleObj(
-	CampaignOptions *co, UIObject *c, const struct vec2i pos,
+	Campaign *co, UIObject *c, const struct vec2i pos,
 	const SelectMode mode, char *label)
 {
 	const int th = FontH();
@@ -208,7 +208,7 @@ static void CreateWeaponSpecialToggleObj(
 	UIObjectAddChild(c, o);
 }
 static void CreateWeaponToggleObjs(
-	CampaignOptions *co, UIObject *c, const UIObject *o, int *idx,
+	Campaign *co, UIObject *c, const UIObject *o, int *idx,
 	const int rows, CArray *guns)
 {
 	const int th = FontH();

src/cdogsed/editor_ui_weapons.h

@@ -33,4 +33,4 @@
 
 
 // Create a context menu for selecting available weapons for the mission
-UIObject *CreateWeaponObjs(CampaignOptions *co);
+UIObject *CreateWeaponObjs(Campaign *co);

src/cdogsed/tile_brush.c

@@ -67,7 +67,7 @@ static const TileClass *GetOrAddTileClass(
 	const color_t mask, const color_t maskAlt);
 static bool Draw(SDL_Window *win, struct nk_context *ctx, void *data);
 EditorResult TileBrush(
-	PicManager *pm, EventHandlers *handlers, CampaignOptions *co,
+	PicManager *pm, EventHandlers *handlers, Campaign *co,
 	int *brushIdx)
 {
 	NKWindowConfig cfg;

src/cdogsed/tile_brush.h

@@ -33,5 +33,5 @@
 #include "editor_brush.h"
 
 EditorResult TileBrush(
-	PicManager *pm, EventHandlers *handlers, CampaignOptions *co,
+	PicManager *pm, EventHandlers *handlers, Campaign *co,
 	int *brushIdx);

src/game.c

@@ -146,7 +146,7 @@ struct vec2i GetPlayerCenter(
 
 typedef struct
 {
-	const CampaignOptions *co;
+	const Campaign *co;
 	struct MissionOptions *m;
 	Map *map;
 	Camera Camera;
@@ -169,7 +169,7 @@ static void RunGameInput(GameLoopData *data);
 static GameLoopResult RunGameUpdate(GameLoopData *data, LoopRunner *l);
 static void RunGameDraw(GameLoopData *data);
 GameLoopData *RunGame(
-	const CampaignOptions *co, struct MissionOptions *m, Map *map)
+	const Campaign *co, struct MissionOptions *m, Map *map)
 {
 	RunGameData *data;
 	CCALLOC(data, sizeof *data);

src/game.h

@@ -57,4 +57,4 @@
 #include "game_loop.h"
 
 GameLoopData *RunGame(
-	const CampaignOptions *co, struct MissionOptions *m, Map *map);
+	const Campaign *co, struct MissionOptions *m, Map *map);

src/hiscores.c

@@ -69,13 +69,13 @@
 // required
 typedef struct
 {
-	CampaignOptions *co;
+	Campaign *co;
 	GraphicsDevice *g;
 } HighScoresScreenData;
 static void HighScoresScreenTerminate(GameLoopData *data);
 static GameLoopResult HighScoresScreenUpdate(
 	GameLoopData *data, LoopRunner *l);
-GameLoopData *HighScoresScreen(CampaignOptions *co, GraphicsDevice *g)
+GameLoopData *HighScoresScreen(Campaign *co, GraphicsDevice *g)
 {
 	HighScoresScreenData *data;
 	CMALLOC(data, sizeof *data);

src/hiscores.h

@@ -56,7 +56,7 @@
 
 #define SCORES_FILE "scores.dat"
 
-GameLoopData *HighScoresScreen(CampaignOptions *co, GraphicsDevice *g);
+GameLoopData *HighScoresScreen(Campaign *co, GraphicsDevice *g);
 void EnterHighScore(PlayerData *data);
 GameLoopData *DisplayAllTimeHighScores(GraphicsDevice *graphics);
 GameLoopData *DisplayTodaysHighScores(GraphicsDevice *graphics);

src/screens_end.c

@@ -330,11 +330,11 @@ static int PlayerListMaxRows(const PlayerList *pl)
 
 typedef struct
 {
-	const CampaignOptions *Campaign;
+	const Campaign *Campaign;
 	const char *FinalWords;
 } VictoryData;
 static void VictoryDraw(void *data);
-GameLoopData *ScreenVictory(CampaignOptions *c)
+GameLoopData *ScreenVictory(Campaign *c)
 {
 	SoundPlay(&gSoundDevice, StrSound("victory"));
 	VictoryData *data;

src/screens_end.h

@@ -29,7 +29,7 @@
 
 #include "game_loop.h"
 
-GameLoopData *ScreenVictory(CampaignOptions *c);
+GameLoopData *ScreenVictory(Campaign *c);
 GameLoopData *ScreenDogfightScores(void);
 GameLoopData *ScreenDogfightFinalScores(void);
 GameLoopData *ScreenDeathmatchFinalScores(void);

src/tests/player_test.c

@@ -12,7 +12,7 @@
 #include <utils.h>
 
 // Stubs
-CampaignOptions gCampaign;
+Campaign gCampaign;
 NetClient gNetClient;
 PlayerTemplates gPlayerTemplates;
 Config gConfig;