Changeset 71

Timestamp:

04/24/07 00:58:43 (1 year ago)

Author:

pmac

Message:

Fix #96

• macro menus broken
  
• added echo when entering macro menu trigger.
  
• updated changes.txt for many (but by no means all) modifications
  

Files:

• trunk/changes.txt (modified) (2 diffs)
• trunk/src/cmd4.c (modified) (4 diffs)
• trunk/src/store.c (modified) (1 diff)

trunk/changes.txt

@@ +1 @@
+Angband 3.0.8
+- "knowledge menu" browser imported from Un/NPP.
+  "~" command now shows "lore" about monsters, objects, etc.
+- True menu support added; (almost) all menus now use a generic API rather
+  than ad hoc event loops (aka spaghetti).  Commonly used menu layouts are scrolling
+  or multi-column, (other layouts aka "skins" are easy to add). All menu actions
+  (print, handle event, etc) are defined as "virtual functions" (callbacks) so you can
+  write your own row-function provider, rather than depend on fitting data into a
+  common data structure.  (About 1/2 the menus fit this one-off model best; the other
+  half are built using a handful of common data structures, like arrays of strings.)
+- Event handler added. (Menus can listen to each other, etc.)
+- pref files and macro files are generated with an "API" (a simple callback wrapper.)
+- Mouse support added.  Menu browsing & selection can be done with either keystrokes
+  or the mouse.
+- [TBD] Pathfind.
+- Makefiles are cleaned up. Where appropriate, they include the list of object files
+  as a common include. Makefile.std now uses primitive "modules" to add/remove support
+  of various terminal interfaces. (No more uncommenting compile lines.)
+- IBM/emx & Amiga/ami support removed. (If somebody would verify them, they will be
+  added back, with pleasure.)
+- Timed player modifiers (blind, confused, etc) now are kept in an array, not separate
+  elements.  This makes it possible to iterate over them, or find them "unconditionally"
+  by table access.
+- "HP changes color" option for ASCII graphics imported from NPP.
+- Some options set to new defaults
+  (HP Changes color, flow-by-smell, flow-by-sound -- true by default)
+  (run-ignore-doors, run-ignore-stairs, disturb-motion -- false by default)
+- Some options eliminated
+- Menu API added.
+- Event API added.
+- Added echo to macro trigger entry.
+
+
+Bug fixes.
+- OSX font selection problem fixed.
+
+
-Angband 3.0.7s3
-Suggestions and (more) patches welcomed.
@@ -22 +59 @@
-  those who like uncluttered gameplay.
-- Get "./configure" working properly again (Marco K).
-Renew
+Modernize
-  main-mac has been removed, as has the MPW makefile.  (Pete Mack)
-- Added support for improved pluralization of object names.  Allow

trunk/src/cmd4.c

@@ -2704 +2704 @@
-        flush();
-
+
-        /* Do not process macros */
-        inkey_base = TRUE;
@@ -2710 +2711 @@
-        ch = inkey();
-
+        text_out_hook = text_out_to_screen;
+
-        /* Read the pattern */
-'\0
+ESCAPE && ch != '\xff
-        {
-                /* Save the key */
-                buf[n++] = ch;
+                buf[n] = 0;
+
+                /* echo */
+                ascii_to_text(tmp, sizeof(tmp), buf+n-1);
+                text_out(tmp);
+                flush();
+
-
-                /* Do not process macros */
@@ -2726 +2736 @@
-        }
-
-        /* Terminate */
-        buf[n] = '\0';
-
-        /* Flush */
-        flush();
-
-
-        /* Convert the trigger */
-        ascii_to_text(tmp, sizeof(tmp), buf);
-
-        /* Hack -- display the trigger */
-        Term_addstr(-1, TERM_WHITE, tmp);
-}
-
@@ -4094 +4094 @@
-        menu_init(menu, MN_SCROLL, MN_ACT, &SCREEN_REGION);
-
+        /* macro menu */
+        menu = &macro_menu;
+        WIPE(menu, menu_type);
+        menu_set_id(menu, 'macr');
+        menu->count = N_ELEMENTS(macro_actions);
+        menu->menu_data = macro_actions;
+        menu->selections = lower_case;
+        menu_init(menu, MN_SCROLL, MN_EVT, &SCREEN_REGION);
+
-        /* knowledge menu */
-        menu = &knowledge_menu;

trunk/src/store.c

@@ -2877 +2877 @@
-                        /* These two can't intersect! */
-                        menu.cmd_keys = "\n\x010\r\t?=CdeEiIls"; /* \x10 = ^p */
-
+1234567890
-                }
-                else