Changeset 171

Timestamp:

06/09/07 08:51:19 (1 year ago)

Author:

takkaria

Message:

• Dump squelch and autoinscribe settings as part of the options dump.
  
• Make version numbers more centralised
  
• Nuke MAINTAINER define, update bugs address
  

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/src/Makefile.osx (modified) (1 diff)
• trunk/src/Makefile.src (modified) (2 diffs)
• trunk/src/Makefile.std (modified) (1 diff)
• trunk/src/cmd4.c (modified) (4 diffs)
• trunk/src/config.h (modified) (1 diff)
• trunk/src/defines.h (modified) (2 diffs)
• trunk/src/init2.c (modified) (1 diff)
• trunk/src/squelch.c (modified) (3 diffs)

trunk/configure.ac

@@ -1 +1 @@
-dnl Process this file with autoconf to produce a configure script.
-http://angband.rogueforge.net/trac
+bugs@rephial.org
-AC_PREREQ([2.50])
-

trunk/src/Makefile.osx

@@ -24 +24 @@
-EXE =angband
-COPYRIGHT =1995-2006 Contributors
-# version number - displayed
-VERSION =3.0.7
-
-# Some Developer CD tools we need - the standard installation location

trunk/src/Makefile.src

@@ -5 +5 @@
-# across a range of different makefiles, to cut down on maintenance.
-#
+
+VERSION = 3.0.8
-
-HDRS = h-basic.h
@@ -57 +59 @@
-        xtra1.o \
-        xtra2.o
-
-

trunk/src/Makefile.std

@@ -65 +65 @@
-# Version info
-EXE = angband
-VERSION = 3.0.8
-
-

trunk/src/cmd4.c

@@ -2612 +2612 @@
-
-/*
+ * Save autoinscription data to a pref file.
+ */
+static void autoinsc_dump(FILE *fff)
+{
+        int i;
+
+        if (!inscriptions)
+                return;
+
+        /* Start dumping */
+        fprintf(fff, "# Autoinscription settings");
+        fprintf(fff, "# B:item kind:inscription\n\n");
+
+        for (i = 0; i < inscriptions_count; i++)
+        {
+                object_kind *k_ptr = &k_info[inscriptions[i].kind_idx];
+
+                /* Describe and write */
+                fprintf(fff, "# Autoinscription for %s\n", k_name + k_ptr->name);
+                fprintf(fff, "B:%d:%s\n\n", inscriptions[i].kind_idx,
+                        quark_str(inscriptions[i].inscription_idx));
+        }
+
+        /* All done */
+        fprintf(fff, "\n");
+}
+
+/*
+ * Save squelch data to a pref file.
+ */
+static void squelch_dump(FILE *fff)
+{
+        int i;
+        int tval, sval;
+        bool squelch;
+
+        /* Start dumping */
+        fprintf(fff, "\n\n");
+        fprintf(fff, "# Squelch bits\n\n");
+
+        /* Dump squelch bits */
+        for (i = 1; i < z_info->k_max; i++)
+        {
+                tval = k_info[i].tval;
+                sval = k_info[i].sval;
+                squelch = k_info[i].squelch;
+
+                /* Dump the squelch info */
+                if (tval || sval)
+                        fprintf(fff, "Q:%d:%d:%d:%d\n", i, tval, sval, squelch);
+        }
+
+        /* All done */
+        fprintf(fff, "\n");
+}
+
+/*
- * Write all current options to a user preference file.
- */
@@ -2671 +2728 @@
-                }
-        }
-
+
+
+
+
+
+
+
-
-/* Hack -- Base Delay Factor */
@@ -3617 +3680 @@
-
-        menu_layout(&color_menu, &SCREEN_REGION);
+
-        /* Interact until done */
-        while (1)
@@ -4066 +4130 @@
-        {
-                int c = inkey();
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }

trunk/src/config.h

@@ -340 +340 @@
-#define CAPITALIZE_USER_NAME
-
-
-
-/*
- * OPTION: Person to bother if something goes wrong.
- */
-#define MAINTAINER      "angbandmaint@gmail.com"
-
-

trunk/src/defines.h

@@ -34 +34 @@
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- */
-#define VERSION_MAJOR   3
@@ -52 +47 @@
-#define VERSION_PATCH   9
-#define VERSION_EXTRA   0
-
-
-/*

trunk/src/init2.c

@@ -1266 +1266 @@
-
-        /* Hack -- Just call the "format()" function */
-%s", MAINTAINER
+I wish you could swim, like dolphins can swim..."
-
-

trunk/src/squelch.c

@@ -531 +531 @@
-
-
-/*** File stuff ***/
-
-/*
- * Save squelch data to a pref file.
- */
-static void dump_squelch_info(void)
-{
-        int i, tval, sval, squelch;
-        FILE *fff;
-        char buf[1024];
-        char fname[80];
-
-        screen_save();
-
-        /* Prompt */
-        prt("Command: Dump Squelch Info", 17, 30);
-        prt("File: ", 18, 30);
-
-        /* Default filename */
-        strnfmt(fname, sizeof(fname), "%s.squ", op_ptr->base_name);
-
-        /* Get a filename */
-        if (askfor_aux(fname, sizeof fname, NULL))
-        {
-                /* Build the filename */
-                path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);
-
-                /* Append to the file */
-                safe_setuid_drop();
-                fff = my_fopen(buf, "a");
-                safe_setuid_grab();
-
-        /* Test for success */
-                if (!fff) return;
-
-                /* Start dumping */
-                fprintf(fff, "\n\n");
-                fprintf(fff, "# Squelch bits\n\n");
-
-                /* Dump squelch bits */
-                for (i = 1; i < z_info->k_max; i++)
-                {
-                        tval = k_info[i].tval;
-                        sval = k_info[i].sval;
-                        squelch = k_info[i].squelch;
-
-                        /* Dump the squelch info */
-                        if (tval || sval)
-                                fprintf(fff, "Q:%d:%d:%d:%d\n", i, tval, sval, squelch);
-                }
-
-                fprintf(fff, "\n\n# squelch_level array\n\n");
-
-                for (i = 0; i < SQUELCH_BYTES; i++)
-                        fprintf(fff, "Q:%d:%d\n", i, squelch_level[i]);
-
-                /* All done */
-                fprintf(fff, "\n\n\n\n");
-
-                /* Close */
-                my_fclose(fff);
-
-                /* Ending message */
-                prt("Squelch file saved successfully.  Hit any key to continue.", 17, 30);
-                inkey();
-        }
-
-        screen_load();
-        return;
-}
-
-
-/*
- * Save autoinscription data to a pref file.
- */
-static int dump_autoins_info(void)
-{
-        int i;
-        FILE *fff;
-        char buf[1024];
-        char fname[80];
-
-        screen_save();
-
-        /* Forget it now if there are no inscriptions. */
-        if (!inscriptions)
-        {
-                prt("No inscriptions to save.  Press any key to continue.", 16, 30);
-                inkey();
-                screen_load();
-                return 0;
-        }
-
-        /* Prompt */
-        prt("Command: Dump Autoinscribe Info", 16, 30);
-        prt("File: ", 17, 30);
-
-        /* Default filename */
-        my_strcpy(fname, op_ptr->base_name, sizeof(fname));
-
-        /* Get a filename */
-        if (askfor_aux(fname, sizeof fname, NULL))
-        {
-                /* Build the filename */
-                path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);
-
-                /* Overwrite the file */
-                safe_setuid_drop();
-                fff = my_fopen(buf, "w");
-                safe_setuid_grab();
-
-                /* Test for success */
-                if (!fff) return 0;
-
-                /* Start dumping */
-                fprintf(fff, "# Format: B:[Item Kind]:[Inscription]\n\n");
-
-                for (i = 0; i < inscriptions_count; i++)
-                {
-                        object_kind *k_ptr = &k_info[inscriptions[i].kind_idx];
-
-                        /* Write a comment for the autoinscription*/
-                        fprintf(fff, "# Autoinscription for %s\n", k_name + k_ptr->name);
-
-                        /* Dump the autoinscribe info */
-                        fprintf(fff, "B:%d:%s\n\n", inscriptions[i].kind_idx,
-                                quark_str(inscriptions[i].inscription_idx));
-                }
-
-                /* Close */
-                my_fclose(fff);
-
-                /* Ending message */
-                prt("Autoinscribe file saved successfully.  (Hit a key.)", 16, 30);
-                inkey();
-        }
-
-        screen_load();
-        return 1;
-}
-
-
-/*
- * Load squelch info from a pref file.
- */
-static void load_squelch_info(void)
-{
-        char fname[80];
-
-        screen_save();
-
-        /* Prompt */
-        prt("Command: Load squelch info from file", 16, 30);
-        prt("File: ", 17, 30);
-
-        /* Default filename */
-        strnfmt(fname, sizeof(fname), "%s.squ", op_ptr->base_name);
-
-        /* Ask for a file (or cancel) */
-        if (askfor_aux(fname, sizeof fname, NULL))
-        {
-                /* Process the given filename, note success or failure */
-                if (process_pref_file(fname))
-                        prt("Failed to load squelch data!  (Hit a key.)", 17, 30);
-                else
-                        prt("Squelch squelch squelch!  (Hit a key.)", 17, 30);
-
-                inkey();
-        }
-
-        screen_load();
-
-        return;
-}
-
-
-
-/*** UI stuff ***/
@@ -1016 +840 @@
-                prt(format("%c) %s", I2A(i), sval_dependent[i].desc), i + 3, 1);
-
-
-
-
-
-
-
-
+
+
-
-        while (!done)
@@ -1042 +861 @@
-
-                /* Choose! */
-
-
-
-
+
-                else if (ch == ESCAPE) done = TRUE;         /* Finished */
-