summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am2
-rw-r--r--src/d_iwad.c37
-rw-r--r--src/d_iwad.h1
-rw-r--r--src/setup/mainmenu.c11
-rw-r--r--src/setup/mode.c137
-rw-r--r--src/setup/mode.h3
6 files changed, 167 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 64be4ee7..5a2267b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,7 +149,9 @@ chocolate_hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
# Source files needed for chocolate-setup:
SETUP_FILES= \
+deh_str.c deh_str.h \
d_mode.c d_mode.h \
+d_iwad.c d_iwad.h \
m_config.c m_config.h \
m_controls.c m_controls.h \
z_native.c z_zone.h
diff --git a/src/d_iwad.c b/src/d_iwad.c
index fdec8cb9..a9a1e2bd 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -635,3 +635,40 @@ char *D_FindIWAD(int mask, GameMission_t *mission)
return result;
}
+// Find all IWADs in the IWAD search path matching the given mask.
+
+iwad_t **D_FindAllIWADs(int mask)
+{
+ iwad_t **result;
+ int result_len;
+ char *filename;
+ int i;
+
+ result = malloc(sizeof(iwad_t *) * (arrlen(iwads) + 1));
+ result_len = 0;
+
+ // Try to find all IWADs
+
+ for (i=0; i<arrlen(iwads); ++i)
+ {
+ if (((1 << iwads[i].mission) & mask) == 0)
+ {
+ continue;
+ }
+
+ filename = D_FindWADByName(iwads[i].name);
+
+ if (filename != NULL)
+ {
+ result[result_len] = &iwads[i];
+ ++result_len;
+ }
+ }
+
+ // End of list
+
+ result[result_len] = NULL;
+
+ return result;
+}
+
diff --git a/src/d_iwad.h b/src/d_iwad.h
index d55a9660..7c297bd5 100644
--- a/src/d_iwad.h
+++ b/src/d_iwad.h
@@ -45,6 +45,7 @@ typedef struct
char *D_FindWADByName(char *filename);
char *D_TryFindWADByName(char *filename);
char *D_FindIWAD(int mask, GameMission_t *mission);
+iwad_t **D_FindAllIWADs(int mask);
#endif
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index 5a5f72fc..90bda7de 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -173,7 +173,6 @@ void MainMenu(void)
static void InitConfig(void)
{
- SetupMission();
InitBindings();
SetChatMacroDefaults();
@@ -240,15 +239,19 @@ static void RunGUI(void)
TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
SetIcon();
-
- MainMenu();
TXT_GUIMainLoop();
}
-void D_DoomMain(void)
+static void MissionSet(void)
{
InitConfig();
+ MainMenu();
+}
+
+void D_DoomMain(void)
+{
+ SetupMission(MissionSet);
RunGUI();
}
diff --git a/src/setup/mode.c b/src/setup/mode.c
index 4fc1b8b9..d5a396ac 100644
--- a/src/setup/mode.c
+++ b/src/setup/mode.c
@@ -22,9 +22,11 @@
#include <string.h>
#include "config.h"
+#include "textscreen.h"
#include "doomtype.h"
#include "d_mode.h"
+#include "d_iwad.h"
#include "i_system.h"
#include "m_argv.h"
#include "m_config.h"
@@ -44,19 +46,48 @@ GameMission_t gamemission;
typedef struct
{
+ char *label;
GameMission_t mission;
+ int mask;
char *name;
char *config_file;
char *extra_config_file;
} mission_config_t;
-static mission_config_t config_files[] =
+// Default mission to fall back on, if no IWADs are found at all:
+
+#define DEFAULT_MISSION (&mission_configs[0])
+
+static mission_config_t mission_configs[] =
{
- { doom, "doom", "default.cfg", PROGRAM_PREFIX "doom.cfg" },
- { heretic, "heretic", "heretic.cfg", PROGRAM_PREFIX "heretic.cfg" },
- { hexen, "hexen", "hexen.cfg", PROGRAM_PREFIX "hexen.cfg" },
+ {
+ "Doom",
+ doom,
+ IWAD_MASK_DOOM,
+ "doom",
+ "default.cfg",
+ PROGRAM_PREFIX "doom.cfg"
+ },
+ {
+ "Heretic",
+ heretic,
+ IWAD_MASK_HERETIC,
+ "heretic",
+ "heretic.cfg",
+ PROGRAM_PREFIX "heretic.cfg"
+ },
+ {
+ "Hexen",
+ hexen,
+ IWAD_MASK_HEXEN,
+ "hexen",
+ "hexen.cfg",
+ PROGRAM_PREFIX "hexen.cfg"
+ }
};
+static GameSelectCallback game_selected_callback;
+
// Miscellaneous variables that aren't used in setup.
static int showMessages = 1;
@@ -123,18 +154,85 @@ static mission_config_t *GetMissionForName(char *name)
{
int i;
- for (i=0; i<arrlen(config_files); ++i)
+ for (i=0; i<arrlen(mission_configs); ++i)
{
- if (!strcmp(config_files[i].name, name))
+ if (!strcmp(mission_configs[i].name, name))
{
- return &config_files[i];
+ return &mission_configs[i];
}
}
return NULL;
}
-void SetupMission(void)
+static void GameSelected(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(config))
+{
+ TXT_CAST_ARG(mission_config_t, config);
+
+ SetMission(config);
+ game_selected_callback();
+}
+
+static void OpenGameSelectDialog(GameSelectCallback callback)
+{
+ mission_config_t *mission;
+ txt_window_t *window;
+ iwad_t **iwads;
+ int num_games;
+ int i;
+
+ window = TXT_NewWindow("Select game");
+
+ TXT_AddWidget(window, TXT_NewLabel("Select a game to configure:\n"));
+ num_games = 0;
+
+ // Add a button for each game.
+
+ for (i=0; i<arrlen(mission_configs); ++i)
+ {
+ // Do we have any IWADs for this game installed?
+ // If so, add a button.
+
+ iwads = D_FindAllIWADs(mission_configs[i].mask);
+
+ if (iwads[0] != NULL)
+ {
+ mission = &mission_configs[i];
+ TXT_AddWidget(window, TXT_NewButton2(mission_configs[i].label,
+ GameSelected,
+ &mission_configs[i]));
+ ++num_games;
+ }
+
+ free(iwads);
+ }
+
+ TXT_AddWidget(window, TXT_NewStrut(0, 1));
+
+ // No IWADs found at all? Fall back to doom, then.
+
+ if (num_games == 0)
+ {
+ TXT_CloseWindow(window);
+ SetMission(DEFAULT_MISSION);
+ callback();
+ return;
+ }
+
+ // Only one game? Use that game, and don't bother with a dialog.
+
+ if (num_games == 1)
+ {
+ TXT_CloseWindow(window);
+ SetMission(mission);
+ callback();
+ return;
+ }
+
+ game_selected_callback = callback;
+}
+
+void SetupMission(GameSelectCallback callback)
{
mission_config_t *config;
char *mission_name;
@@ -149,22 +247,23 @@ void SetupMission(void)
p = M_CheckParm("-game");
- if (p > 0)
+ if (p > 0)
{
mission_name = myargv[p + 1];
- }
- else
- {
- mission_name = "doom";
- }
- config = GetMissionForName(mission_name);
+ config = GetMissionForName(mission_name);
+
+ if (config == NULL)
+ {
+ I_Error("Invalid parameter - '%s'", mission_name);
+ }
- if (config == NULL)
+ SetMission(config);
+ callback();
+ }
+ else
{
- I_Error("Invalid parameter - '%s'", mission_name);
+ OpenGameSelectDialog(callback);
}
-
- SetMission(config);
}
diff --git a/src/setup/mode.h b/src/setup/mode.h
index c6d0dc66..a78a5bc2 100644
--- a/src/setup/mode.h
+++ b/src/setup/mode.h
@@ -24,9 +24,10 @@
#include "d_mode.h"
+typedef void (*GameSelectCallback)(void);
extern GameMission_t gamemission;
-void SetupMission(void);
+void SetupMission(GameSelectCallback callback);
void InitBindings(void);
#endif /* #ifndef SETUP_MODE_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 18:25:34 +0000