Changeset 538

Timestamp:

08/19/07 12:46:27 (1 year ago)

Author:

ajps

Message:

First stages of new game command interface thing. Seems to work OK on Windows and Linux, will have broken mac, ros, etc.

Files:

• trunk/src/Makefile.src (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (2 diffs)
• trunk/src/init2.c (modified) (6 diffs)
• trunk/src/main-win.c (modified) (9 diffs)
• trunk/src/main.c (modified) (4 diffs)
• trunk/src/ui-event.c (modified) (1 diff)
• trunk/src/ui-event.h (modified) (3 diffs)
• trunk/src/xtra3.c (modified) (2 diffs)

trunk/src/Makefile.src

@@ -35 +35 @@
-        effects.o \
-        files.o \
+        game-cmd.o \
-        generate.o \
-        init1.o \

trunk/src/dungeon.c

@@ -1767 +1767 @@
- * flag, which is a hack, but which optimizes loading of savefiles.
- */
-bool new_game
+void
-{
+        /* Initialize */
+        bool new_game = init_angband();
+
+
+
-        /*** Do horrible, hacky things, to start the game off ***/
-

trunk/src/externs.h

@@ -315 +315 @@
-
-/* dungeon.c */
-bool new_game
+void
-extern int value_check_aux1(const object_type *o_ptr);
-
@@ -344 +344 @@
-extern void init_file_paths(const char *path);
-extern void create_user_dirs(void);
-void
+bool
-extern void cleanup_angband(void);
-

trunk/src/init2.c

@@ -15 +15 @@
-#include "cmds.h"
-#include "option.h"
+#include "ui-event.h"
+#include "game-cmd.h"
-
-/*
@@ -1351 +1353 @@
-
-
-/*
- * Hack -- take notes on line 23
- */
-static void note(cptr str)
-{
-        Term_erase(0, 23, 255);
-        Term_putstr(20, 23, -1, TERM_WHITE, str);
-        Term_fresh();
-}
-
-
-
-/*
- * Hack -- Explain a broken "lib" folder and quit (see below).
- */
-static void init_angband_aux(cptr why)
-{
-        quit_fmt("%s\n\n%s", why,
-                 "The 'lib' directory is probably missing or broken.\n"
-                 "Perhaps the archive was not extracted correctly.\n"
-                 "See the 'readme.txt' file for more information.");
-}
-
-
-/*
@@ -1422 +1401 @@
- * if needed, in the first (?) pass through "TERM_XTRA_REACT".
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        /* Initialize the menus */
@@ -1475 +1411 @@
-        /*** Initialize some arrays ***/
-
-
-        /* Initialize size info */
-note("[Initializing array sizes...]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing array sizes...
-        if (init_z_info()) quit("Cannot initialize sizes");
-
-        /* Initialize feature info */
-note("[Initializing arrays... (features)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (features)
-        if (init_f_info()) quit("Cannot initialize features");
-
-        /* Initialize object info */
-note("[Initializing arrays... (objects)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (objects)
-        if (init_k_info()) quit("Cannot initialize objects");
-
-        /* Initialize artifact info */
-note("[Initializing arrays... (artifacts)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (artifacts)
-        if (init_a_info()) quit("Cannot initialize artifacts");
-
-        /* Initialize ego-item info */
-note("[Initializing arrays... (ego-items)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (ego-items
-        if (init_e_info()) quit("Cannot initialize ego-items");
-
-        /* Initialize monster info */
-note("[Initializing arrays... (monsters)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (monsters)
-        if (init_r_info()) quit("Cannot initialize monsters");
-
-        /* Initialize feature info */
-note("[Initializing arrays... (vaults)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (vaults)
-        if (init_v_info()) quit("Cannot initialize vaults");
-
-        /* Initialize history info */
-note("[Initializing arrays... (histories)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (histories)
-        if (init_h_info()) quit("Cannot initialize histories");
-
-        /* Initialize race info */
-note("[Initializing arrays... (races)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (races)
-        if (init_p_info()) quit("Cannot initialize races");
-
-        /* Initialize class info */
-note("[Initializing arrays... (classes)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (classes)
-        if (init_c_info()) quit("Cannot initialize classes");
-
-        /* Initialize owner info */
-note("[Initializing arrays... (owners)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (owners)
-        if (init_b_info()) quit("Cannot initialize owners");
-
-        /* Initialize price info */
-note("[Initializing arrays... (prices)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (prices)
-        if (init_g_info()) quit("Cannot initialize prices");
-
-        /* Initialize flavor info */
-note("[Initializing arrays... (flavors)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (flavors)
-        if (init_flavor_info()) quit("Cannot initialize flavors");
-        
-        /* Initialize spell info */
-note("[Initializing arrays... (spells)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (spells)
-        if (init_s_info()) quit("Cannot initialize spells");
-
-        /* Initialize spellbook info */
-note("[Initializing arrays... (spellbooks)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (spellbooks)
-        init_books();
-
-        /* Initialize some other arrays */
-note("[Initializing arrays... (other)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (other)
-        if (init_other()) quit("Cannot initialize other stuff");
-
-        /* Initialize some other arrays */
-note("[Initializing arrays... (alloc)]
+ui_event_signal_string(ui_INIT_STATUS, "Initializing arrays... (alloc)
-        if (init_alloc()) quit("Cannot initialize alloc stuff");
-
@@ -1547 +1482 @@
-
-        /* Initialize feature info */
-note("[Loading basic user pref file...]
+ui_event_signal_string(ui_INIT_STATUS, "Loading basic user pref file...
-
-        /* Process that file */
@@ -1553 +1488 @@
-
-        /* Done */
-note("[Initialization complete]
+ui_event_signal_string(ui_INIT_STATUS, "Initialization complete
-
-        /* Sneakily init command list */
-        cmd_init();
+
+        /* Ask for a "command" until we get one we like. */
+        while (1)
+        {
+                game_command command_req = get_game_command();
+
+                if (command_req.command == CMD_QUIT)
+                        quit(NULL);
+
+                else if (command_req.command == CMD_NEWGAME)
+                        return TRUE;
+
+                else if (command_req.command == CMD_LOADFILE)
+                        /* In future we might want to pass back or set the savefile
+                           path here. */
+                        return FALSE;
+        }
-}
-

trunk/src/main-win.c

@@ -661 +661 @@
-};
-
+#include "game-cmd.h"
+
+static game_command cmd = { CMD_NULL, 0 };
+
-#if 0
-/*
@@ -2946 +2950 @@
-        /* Next arg */
-        p = strchr(s, ' ');
-
+
-        /* Tokenize */
-        if (p) *p = '\0';
@@ -2956 +2960 @@
-        validate_file(savefile);
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -3159 +3155 @@
-                        else
-                        {
-
-
-
-
+
+
-                        }
-                        break;
@@ -3194 +3188 @@
-                                        /* Load 'savefile' */
-                                        validate_file(savefile);
-
-
-
-
+
+
+
-                                }
-                        }
@@ -4554 +4547 @@
-
-        exit(0);
+}
+
+
+static game_command get_init_cmd()
+{
+        MSG msg;
+
+        /* Prompt the user */
+        prt("[Choose 'New' or 'Open' from the 'File' menu]", 23, 17);
+        Term_fresh();
+
+        /* Process messages forever */
+        while (cmd.command == CMD_NULL && GetMessage(&msg, NULL, 0, 0))
+        {
+                TranslateMessage(&msg);
+                DispatchMessage(&msg);
+        }
+
+        /* Bit of a hack, we'll do this when we leave the INIT context in future. */
+        game_in_progress = TRUE;
+
+        return cmd;
-}
-
@@ -4709 +4724 @@
-        WNDCLASS wc;
-        HDC hdc;
-        MSG msg;
-
-        /* Unused parameter */
@@ -4843 +4857 @@
-        ANGBAND_SYS = "win";
-
-        /* Initialize */
-        init_angband();
-
-        /* We are now initialized */
-        initialized = TRUE;
-
-#ifdef USE_SAVER
-        if (screensaver)
@@ -4870 +4878 @@
-        check_for_save_file(lpCmdLine);
-
-Prompt the user
-prt("[Choose 'New' or 'Open' from the 'File' menu]", 23, 17)
-
-
-/* Process messages forever */
-
-{
-
-       DispatchMessage(&msg);
-}
+Set command hook
+get_game_command = get_init_cmd
+
+
+init_display();
+
+initialized = TRUE;
+
+/* Play the game */
+play_game();
-
-        /* Paranoia */

trunk/src/main.c

@@ -30 +30 @@
-
-#include "main.h"
+#include "game-cmd.h"
-
-
@@ -193 +194 @@
-#endif /* SET_UID */
-
+static bool new_game;
+
+/*
+ * Pass the appropriate "Initialisation screen" command to the game,
+ * getting user input if needed.
+ */ 
+static game_command get_init_cmd()
+{
+        game_command cmd;
+
+        /* Wait for response */
+        pause_line(Term->hgt - 1);
+
+        if (new_game)
+                cmd.command = CMD_NEWGAME;
+        else
+                /* This might be modified to supply the filename in future. */
+                cmd.command = CMD_LOADFILE;
+
+        return cmd;
+}
+
-
-/*
@@ -206 +229 @@
-
-        bool done = FALSE;
-        bool new_game = FALSE;
-
-        int show_score = 0;
@@ -435 +457 @@
-        signals_init();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        /* Play the game */
-new_game
+
-
-        /* Free resources */

trunk/src/ui-event.c

@@ -129 +129 @@
-        ui_event_dispatch(type, &data);
-}
+
+
+void ui_event_signal_string(ui_event_type type, const char *s)
+{
+        ui_event_data data;
+        data.string = s;
+
+        ui_event_dispatch(type, &data);
+}

trunk/src/ui-event.h

@@ -34 +34 @@
-        ui_MESSAGES_CHANGED,
-
-
+
+
+
+
+
+
+
+
+
+
-} ui_event_type;
-
-event_REDRAW
+ENTER_DEATH
-
-typedef union
@@ -46 +55 @@
-                int y;
-        } point;
+
+        const char *string;
-
-} ui_event_data;
@@ -57 +68 @@
-
-void ui_event_signal_point(ui_event_type, int x, int y);
+void ui_event_signal_string(ui_event_type, const char *s);
-void ui_event_signal(ui_event_type);
-

trunk/src/xtra3.c

@@ -1460 +1460 @@
-
-/* ------------------------------------------------------------------------
+ * Showing and updating the splash screen.
+ * ------------------------------------------------------------------------ */
+/*
+ * Hack -- Explain a broken "lib" folder and quit (see below).
+ */
+static void init_angband_aux(cptr why)
+{
+        quit_fmt("%s\n\n%s", why,
+                 "The 'lib' directory is probably missing or broken.\n"
+                 "Perhaps the archive was not extracted correctly.\n"
+                 "See the 'readme.txt' file for more information.");
+}
+
+/*
+ * Hack -- take notes on line 23
+ */
+static void splashscreen_note(ui_event_type type, ui_event_data *data, void *user)
+{
+        Term_erase(0, 23, 255);
+        Term_putstr(20, 23, -1, TERM_WHITE, format("[%s]", data->string));
+        Term_fresh();
+}
+
+static void show_splashscreen(ui_event_type type, ui_event_data *data, void *user)
+{
+        ang_file *fp;
+
+        char buf[1024];
+
+        /*** Verify the "news" file ***/
+
+        path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "news.txt");
+        if (!file_exists(buf))
+        {
+                char why[1024];
+
+                /* Crash and burn */
+                strnfmt(why, sizeof(why), "Cannot access the '%s' file!", buf);
+                init_angband_aux(why);
+        }
+
+
+        /*** Display the "news" file ***/
+
+        Term_clear();
+
+        /* Open the News file */
+        path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "news.txt");
+        fp = file_open(buf, MODE_READ, -1);
+
+        /* Dump */
+        if (fp)
+        {
+                int i = 0;
+
+                /* Dump the file to the screen */
+                while (file_getl(fp, buf, sizeof(buf)))
+                        Term_putstr(0, i++, -1, TERM_WHITE, buf);
+
+                file_close(fp);
+        }
+
+        /* Flush it */
+        Term_fresh();
+}
+
+
+/* ------------------------------------------------------------------------
- * Temporary (hopefully) hackish solutions.
- * ------------------------------------------------------------------------ */
@@ -1492 +1560 @@
-        /* Check if the panel should shift when the player's moved */
-        ui_event_register(ui_PLAYER_MOVED, check_panel, NULL);
-
+
+
+
+
+
+