Changeset 1106

Timestamp:

01/09/09 07:55:46 (9 hours ago)

Author:

takkaria

Message:

Bug: #513

• Refactor the code that prompts for character dump filenames so that it can be overriden by platform-native ports.
  

Files:

• trunk/src/cmd4.c (modified) (1 diff)
• trunk/src/death.c (modified) (2 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/files.c (modified) (2 diffs)
• trunk/src/util.c (modified) (1 diff)

trunk/src/cmd4.c

@@ -2021 +2021 @@
-                else if (ke.key == 'f')
-                {
-
-
-
-
-
+
+
+
+
+
+
-                        {
-
-
-
-
-
-
-
+
+
+
+
-                        }
-                }

trunk/src/death.c

@@ -180 +180 @@
-static void death_file(void *unused, const char *title)
-{
+        char buf[1024];
-        char ftmp[80];
+
+        (void)unused;
+        (void)title;
+
-        strnfmt(ftmp, sizeof(ftmp), "%s.txt", op_ptr->base_name);
-
-
-
-
-
-
-
-
+
-        {
-                errr err;
@@ -195 +194 @@
-                /* Dump a character file */
-                screen_save();
-ftmp
+buf
-                screen_load();
-

trunk/src/externs.h

@@ -626 +626 @@
-extern s16b get_quantity(cptr prompt, int max);
-extern bool get_check(cptr prompt);
+bool (*get_file)(const char *suggested_name, char *path, size_t len);
-extern bool get_com(cptr prompt, char *command);
-extern bool get_com_ex(cptr prompt, ui_event_data *command);

trunk/src/files.c

@@ -1909 +1909 @@
- * and trigger its usage from various places in the code.
- */
-ptr name
+onst char *path
-{
-        int i, x, y;
@@ -1928 +1928 @@
-        (void)full;
-
-        /* Build the filename */
-        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, name);
-
-        /* Check if the file currently exists */
-        if (file_exists(buf))
-        {
-                char out_val[160];
-
-                /* Build query */
-                strnfmt(out_val, sizeof(out_val), "Replace existing file %s? ", buf);
-
-                /* Ask */
-                if (!get_check(out_val))
-                        return -1;
-        }
-
-        /* Open the file for writing */
-buf
+path
-        if (!fp) return (-1);
-

trunk/src/util.c

@@ -2620 +2620 @@
-
-
+/**
+ * Text-native way of getting a filename.
+ */
+bool get_file_text(const char *suggested_name, char *path, size_t len)
+{
+        char buf[160];
+
+        /* Get filename */
+        my_strcpy(buf, suggested_name, sizeof buf);
+        if (!get_string("File name: ", buf, sizeof buf)) return FALSE;
+
+        /* Make sure it's actually a filename */
+        if (buf[0] == '\0' || buf[0] == ' ') return FALSE;
+
+        /* Build the path */
+        path_build(path, len, ANGBAND_DIR_USER, buf);
+
+        /* Check if it already exists */
+        if (file_exists(buf))
+        {
+                char buf2[160];
+                strnfmt(buf2, sizeof(buf2), "Replace existing file %s?", buf);
+
+                if (get_check(buf2) == FALSE)
+                        return FALSE;
+        }
+
+        return TRUE;
+}
+
+
+
+
+/**
+ * Get a pathname to save a file to, given the suggested name.  Returns the
+ * result in "path".
+ */
+bool (*get_file)(const char *suggested_name, char *path, size_t len) = get_file_text;
+
+
+
+
-/*
- * Prompts for a keypress