gmane.games.roguelike.angband.vanilla.cvs

r2050 - in /trunk/src: Makefile.inc Makefile.srcui-event.c ui-event.h

2010-09-25T21:57:09

Author: takkaria
Date: Sat Sep 25 21:57:08 2010
New Revision: 2050

URL: http://trac.rephial.org/changeset/2050
Log:
Remove ui-event.c

Removed:
    trunk/src/ui-event.c
Modified:
    trunk/src/Makefile.inc
    trunk/src/Makefile.src
    trunk/src/ui-event.h

Modified: trunk/src/Makefile.inc
URL: http://trac.rephial.org/file/trunk/src/Makefile.inc?rev=2050
==============================================================================
--- trunk/src/Makefile.inc (original)
+++ trunk/src/Makefile.inc Sat Sep 25 21:57:08 2010
< at >< at > -17,482 +17,475 < at >< at >
 done;
 
 # Dependencies
-./attack.o: attack.c angband.h h-basic.h z-bitflag.h z-virt.h z-file.h \
-  z-form.h z-util.h z-rand.h defines.h list-blow-methods.h \
+./attack.o: attack.c angband.h h-basic.h z-bitflag.h z-form.h z-virt.h \
+  z-file.h z-util.h z-rand.h defines.h list-blow-methods.h \
   list-blow-effects.h list-object-flags.h list-player-flags.h \
   list-mon-flags.h list-mon-spells.h z-term.h ui-event.h z-quark.h \
   z-msg.h config.h option.h types.h obj

r2052 - /trunk/src/cmd4.c

2010-09-25T21:57:14

Author: takkaria
Date: Sat Sep 25 21:57:13 2010
New Revision: 2052

URL: http://trac.rephial.org/changeset/2052
Log:
refactor some options menus code

Modified:
    trunk/src/cmd4.c

Modified: trunk/src/cmd4.c
URL: http://trac.rephial.org/file/trunk/src/cmd4.c?rev=2052
==============================================================================
--- trunk/src/cmd4.c (original)
+++ trunk/src/cmd4.c Sat Sep 25 21:57:13 2010
< at >< at > -590,18 +590,16 < at >< at >
 
 menu_layout(menu, &SCREEN_REGION);
 
-while (TRUE)
-{
-ui_event_data cx;
-
+ui_event_data cx = EVENT_EMPTY;
+while (cx.type != EVT_ESCAPE)
+{
 cx = menu_select(menu, 0);
 
-if (cx.type == EVT_ESCAPE)
-break;
-else if (cx.type == EVT_SELECT && strchr("YN", toupper((unsigned char) cx.key)))
+if (cx.type == EVT_SELECT && strchr("YN", toupper((unsigned char) cx.key)))
+{
 menu->cursor++;
-
-menu->cursor = (menu->cursor + n) % n;
+menu->cursor = (menu->cursor + n) % n;
+}
 }
 
 /* Hack -- Notice use of any "cheat" options */

r2051 - in /trunk/src: cmd-know.c cmd0.c cmd4.c death.c squelch.c store.c ui-birth.c ui-menu.c ui-menu.h

2010-09-25T21:57:11

Author: takkaria
Date: Sat Sep 25 21:57:11 2010
New Revision: 2051

URL: http://trac.rephial.org/changeset/2051
Log:
 - refactor menu_handle_event to pass out an event to its caller instead of using Term_event_push(), and clean it up a lot
 - make menu_select() a lot simpler and stop it taking a cursor paramater (just use menu->cursor now)
 - move menus across to checking for evt.type == EVT_ESCAPE instead of evt.key == ESCAPE

known issues
 - options menus don't work
 - knowledge menus will crash

Modified:
    trunk/src/cmd-know.c
    trunk/src/cmd0.c
    trunk/src/cmd4.c
    trunk/src/death.c
    trunk/src/squelch.c
    trunk/src/store.c
    trunk/src/ui-birth.c
    trunk/src/ui-menu.c
    trunk/src/ui-menu.h

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2051
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:57:11 2010
< at >< at > -564,10 +564,11 < at >< at >
 bool handled =

r2053 - /trunk/src/cmd-know.c

2010-09-25T21:57:15

Author: takkaria
Date: Sat Sep 25 21:57:14 2010
New Revision: 2053

URL: http://trac.rephial.org/changeset/2053
Log:
simplify & fix the central knowledge screen code

Modified:
    trunk/src/cmd-know.c

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2053
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:57:14 2010
< at >< at > -453,8 +453,6 < at >< at >
 /* with "pop-up menu" for lore */
 while ((!flag) && (grp_cnt))
 {
-ui_event_data ke;
-
 if (redraw)
 {
 /* Print the title bits */
< at >< at > -561,19 +559,17 < at >< at >
 delay = 0;
 }
 
-bool handled = TRUE;
-while (handled)
-{
-ui_event_data ke0 = EVENT_EMPTY;
-ke = inkey_ex();
-
-if (!visual_list && (ke.type & (EVT_KBRD | EVT_MOUSE | EVT_REFRESH)))
-handled = menu_handle_event(active_menu, &ke, &ke0);
-else
-handled = FALSE;
-}
-
-/* Do visual mode command if needed */
+
+ui_event_data ke;
+ui_ev

r2044 - in /trunk/src: ui-event.c ui-event.hui-menu.c

2010-09-25T21:57:02

Author: takkaria
Date: Sat Sep 25 21:57:02 2010
New Revision: 2044

URL: http://trac.rephial.org/changeset/2044
Log:
Remove EVT_STOP (unused)

Modified:
    trunk/src/ui-event.c
    trunk/src/ui-event.h
    trunk/src/ui-menu.c

Modified: trunk/src/ui-event.c
URL: http://trac.rephial.org/file/trunk/src/ui-event.c?rev=2044
==============================================================================
--- trunk/src/ui-event.c (original)
+++ trunk/src/ui-event.c Sat Sep 25 21:57:02 2010
< at >< at > -51,7 +51,6 < at >< at >
  * start: optional initial event that allows you to prime the loop without pushing the event queue
  *
  *  Returns:
- *    EVT_STOP - the loop was halted.
  *    EVT_AGAIN - start was not handled
  *    The first unhandled event.
  */
< at >< at > -67,9 +66,6 < at >< at >
 if (start) ke = *start;
 else ke = inkey_ex();
 
-if (ke.type == EVT_STOP)
-break;
-
 if (ke.type & event_flags)
 handled = handler(data, &ke);
 

Modified: trunk/src/ui-event.h
URL: http://trac.rephial.org/file/trunk/src/ui-event.h?rev=2044
=====

r2047 - in /trunk/src: ui-event.c ui-event.hui-menu.c

2010-09-25T21:57:05

Author: takkaria
Date: Sat Sep 25 21:57:05 2010
New Revision: 2047

URL: http://trac.rephial.org/changeset/2047
Log:
Simplify run_event_listener again

Modified:
    trunk/src/ui-event.c
    trunk/src/ui-event.h
    trunk/src/ui-menu.c

Modified: trunk/src/ui-event.c
URL: http://trac.rephial.org/file/trunk/src/ui-event.c?rev=2047
==============================================================================
--- trunk/src/ui-event.c (original)
+++ trunk/src/ui-event.c Sat Sep 25 21:57:05 2010
< at >< at > -48,31 +48,17 < at >< at >
  * handler: function to call for each event
  * data: data to give to that function
  * event_flags: events that the function is interested in
- * start: optional initial event that allows you to prime the loop without pushing the event queue
  *
- *  Returns the first unhandled event.
+ * Returns the first unhandled event.
  */
-ui_event_data run_event_loop(bool (*handler)(void *object, const ui_event_data *in), void *data, int event_flags, const ui_event_data *start)
+ui_event_data run_event_loop(b

r2049 - /trunk/src/ui-menu.c

2010-09-25T21:57:07

Author: takkaria
Date: Sat Sep 25 21:57:07 2010
New Revision: 2049

URL: http://trac.rephial.org/changeset/2049
Log:
stop using run_event_loop

Modified:
    trunk/src/ui-menu.c

Modified: trunk/src/ui-menu.c
URL: http://trac.rephial.org/file/trunk/src/ui-menu.c?rev=2049
==============================================================================
--- trunk/src/ui-menu.c (original)
+++ trunk/src/ui-menu.c Sat Sep 25 21:57:07 2010
< at >< at > -733,7 +733,10 < at >< at >
 /* Stop on first unhandled event */
 while (!(ke.type & no_handle))
 {
-ke = run_event_loop(menu_handle_event, menu, (EVT_KBRD | EVT_MOUSE | EVT_REFRESH));
+ke = inkey_ex();
+
+if (menu_handle_event(menu, &ke))
+continue;
 
 switch (ke.type)
 {

r2048 - /trunk/src/cmd-know.c

2010-09-25T21:57:07

Author: takkaria
Date: Sat Sep 25 21:57:06 2010
New Revision: 2048

URL: http://trac.rephial.org/changeset/2048
Log:
re-enable the mouse for selecting visuals

Modified:
    trunk/src/cmd-know.c

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2048
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:57:06 2010
< at >< at > -572,20 +572,20 < at >< at >
 handled = FALSE;
 }
 
+/* Do visual mode command if needed */
+if (o_funcs.xattr && o_funcs.xchar)
+{
+if (visual_mode_command(ke, &visual_list, browser_rows - 1,
+wid - (g_name_len + 3), &attr_top, &char_left,
+o_funcs.xattr(oid), (byte *)o_funcs.xchar(oid),
+g_name_len + 3, 7, &delay))
+continue;
+}
+
 switch (ke.type)
 {
 case EVT_KBRD:
 {
-/* Do visual mode command if needed */
-if (o_funcs.xattr && o_funcs.xchar)
-{
-if (visual_mode_command(ke, &visual_list, browser_rows

r2046 - /trunk/src/cmd-know.c

2010-09-25T21:57:04

Author: takkaria
Date: Sat Sep 25 21:57:04 2010
New Revision: 2046

URL: http://trac.rephial.org/changeset/2046
Log:
Stop using run_event_loop() in the knowledge menus

Modified:
    trunk/src/cmd-know.c

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2046
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:57:04 2010
< at >< at > -561,34 +561,45 < at >< at >
 delay = 0;
 }
 
-ke = inkey_ex();
-
-/* Do visual mode command if needed */
-if (o_funcs.xattr && o_funcs.xchar &&
-visual_mode_command(ke, &visual_list, browser_rows-1, wid - (g_name_len + 3),
-&attr_top, &char_left, o_funcs.xattr(oid), (byte *)o_funcs.xchar(oid),
-g_name_len + 3, 7, &delay))
-{
-continue;
-}
-
-if (ke.type == EVT_MOUSE)
-{
-/* Change active panels */
-if (region_inside(&inactive_menu->boundary, &ke))
-{
-swap(active_menu, inactive_menu);
-swap(active_cursor, in

r2045 - in /trunk/src: cmd-know.c ui-event.cui-event.h

2010-09-25T21:57:03

Author: takkaria
Date: Sat Sep 25 21:57:03 2010
New Revision: 2045

URL: http://trac.rephial.org/changeset/2045
Log:
Remove EVT_AGAIN and simplify run_event_listener again

Modified:
    trunk/src/cmd-know.c
    trunk/src/ui-event.c
    trunk/src/ui-event.h

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2045
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:57:03 2010
< at >< at > -453,7 +453,7 < at >< at >
 /* with "pop-up menu" for lore */
 while ((!flag) && (grp_cnt))
 {
-ui_event_data ke, ke0;
+ui_event_data ke;
 
 if (redraw)
 {
< at >< at > -565,12 +565,9 < at >< at >
 
 /* Do visual mode command if needed */
 if (o_funcs.xattr && o_funcs.xchar &&
-visual_mode_command(ke, &visual_list,
-browser_rows-1, wid - (g_name_len + 3),
-&attr_top, &char_left,
-o_funcs.xattr(oid), (byte*)
-o_funcs.xchar(oid),
-g_name_len + 3, 7, &delay))
+visual_mode_command(

r2042 - in /trunk/src: cmd-know.c ui-event.cui-event.h ui-menu.c ui-menu.h

2010-09-25T21:56:59

Author: takkaria
Date: Sat Sep 25 21:56:57 2010
New Revision: 2042

URL: http://trac.rephial.org/changeset/2042
Log:
Simplify run_event_listener() and remove some unnecessary types

Modified:
    trunk/src/cmd-know.c
    trunk/src/ui-event.c
    trunk/src/ui-event.h
    trunk/src/ui-menu.c
    trunk/src/ui-menu.h

Modified: trunk/src/cmd-know.c
URL: http://trac.rephial.org/file/trunk/src/cmd-know.c?rev=2042
==============================================================================
--- trunk/src/cmd-know.c (original)
+++ trunk/src/cmd-know.c Sat Sep 25 21:56:57 2010
< at >< at > -586,7 +586,7 < at >< at >
 }
 }
 
-ke0 = run_event_loop(&active_menu->target, &ke);
+ke0 = run_event_loop(menu_handle_event, active_menu, (EVT_KBRD | EVT_MOUSE | EVT_REFRESH), &ke);
 if (ke0.type != EVT_AGAIN) ke = ke0;
 
 switch (ke.type)

Modified: trunk/src/ui-event.c
URL: http://trac.rephial.org/file/trunk/src/ui-event.c?rev=2042
==============================================================================
--- trunk/src/ui-event.c

r2043 - /trunk/src/ui-menu.c

2010-09-25T21:57:01

Author: takkaria
Date: Sat Sep 25 21:57:01 2010
New Revision: 2043

URL: http://trac.rephial.org/changeset/2043
Log:
Remove a call to run_event_listener whose practical use was to call menu_refresh(), and replace it will a call to that function

Modified:
    trunk/src/ui-menu.c

Modified: trunk/src/ui-menu.c
URL: http://trac.rephial.org/file/trunk/src/ui-menu.c?rev=2043
==============================================================================
--- trunk/src/ui-menu.c (original)
+++ trunk/src/ui-menu.c Sat Sep 25 21:57:01 2010
< at >< at > -710,7 +710,7 < at >< at >
  */
 ui_event_data menu_select(menu_type *menu, int *cursor, int no_handle)
 {
-ui_event_data ke;
+ui_event_data ke = EVENT_EMPTY;
 
 menu->cursor = *cursor;
 
< at >< at > -721,9 +721,7 < at >< at >
 if (!menu->filter_list)
 menu->filter_count = menu->count;
 
-ke.type = EVT_REFRESH;
-
-(void)run_event_loop(menu_handle_event, menu, (EVT_KBRD | EVT_MOUSE | EVT_REFRESH), &ke);
+menu_refresh(menu);
 
 /* Check for command flag */
 if (p_ptr->command_new)
< at >< at > -732,7 +730,7

r2041 - in /trunk/src: attack.c cmd-obj.c cmd1.c player/types.h target.c util.c

2010-08-18T15:03:44

Author: ajps
Date: Wed Aug 18 15:03:43 2010
New Revision: 2041

URL: http://trac.rephial.org/changeset/2041
Log:
Misc coding guideline changes, update player type with better comments and remove unused p_ptr->command_inv

Modified:
    trunk/src/attack.c
    trunk/src/cmd-obj.c
    trunk/src/cmd1.c
    trunk/src/player/types.h
    trunk/src/target.c
    trunk/src/util.c

Modified: trunk/src/attack.c
URL: http://trac.rephial.org/file/trunk/src/attack.c?rev=2041
==============================================================================
--- trunk/src/attack.c (original)
+++ trunk/src/attack.c Wed Aug 18 15:03:43 2010
< at >< at > -816,7 +816,7 < at >< at >
 }
 
 /* Find first eligible ammo in the quiver */
-for (i=QUIVER_START; i < QUIVER_END; i++)
+for (i = QUIVER_START; i < QUIVER_END; i++)
 {
 if (inventory[i].tval != p_ptr->state.ammo_tval) continue;
 item = i;

Modified: trunk/src/cmd-obj.c
URL: http://trac.rephial.org/file/trunk/src/cmd-obj.c?rev=2041
=============================================================

r2040 - in /trunk: lib/edit/object.txtsrc/list-effects.h

2010-08-16T17:17:36

Author: d_m
Date: Mon Aug 16 17:17:34 2010
New Revision: 2040

URL: http://trac.rephial.org/changeset/2040
Log:
eddie's patch for clairvoyance descr, boot rarity and priest books

Modified:
    trunk/lib/edit/object.txt
    trunk/src/list-effects.h

Modified: trunk/lib/edit/object.txt
URL: http://trac.rephial.org/file/trunk/lib/edit/object.txt?rev=2040
==============================================================================
--- trunk/lib/edit/object.txt (original)
+++ trunk/lib/edit/object.txt Mon Aug 16 17:17:34 2010
< at >< at > -755,7 +755,7 < at >< at >
 G:]:U
 I:30:1:0
 W:0:0:15:4
-A:20:1 to 20
+A:20:1 to 100
 P:1:1d1:0:0:0
 D:A set of open-topped footgear with soft calfskin lacings and a sturdy 
 D:cured leather base.
< at >< at > -3286,7 +3286,7 < at >< at >
 N:466:[Chants and Blessings]
 G:?:G
 I:91:2:0
-W:20:0:30:300
+W:20:0:30:400
 A:50:20 to 100
 P:0:1d1:0:0:0
 F:EASY_KNOW
< at >< at > -3294,7 +3294,7 < at >< at >
 N:467:[Exorcism and Dispelling]
 G:?:G
 I:91:3:0
-W:30:0:30:900
+W:30:0:30:800
 A:50:30 to 100
 P:0:1d1:0:0:0
 F:EASY_KNOW
< at >< at > -3351,7 +33

r2039 - /trunk/src/spells2.c

2010-08-14T12:55:31

Author: ajps
Date: Sat Aug 14 12:55:30 2010
New Revision: 2039

URL: http://trac.rephial.org/changeset/2039
Log:
Fix out-of-bounds memory read in map_area (as reported by jbu on oook)

Modified:
    trunk/src/spells2.c

Modified: trunk/src/spells2.c
URL: http://trac.rephial.org/file/trunk/src/spells2.c?rev=2039
==============================================================================
--- trunk/src/spells2.c (original)
+++ trunk/src/spells2.c Sat Aug 14 12:55:30 2010
< at >< at > -467,8 +467,11 < at >< at >
 x1 = p_ptr->px - DETECT_DIST_X;
 x2 = p_ptr->px + DETECT_DIST_X;
 
+/* Drag the co-ordinates into the dungeon */
 if (y1 < 0) y1 = 0;
 if (x1 < 0) x1 = 0;
+if (y2 > DUNGEON_HGT - 1) y2 = DUNGEON_HGT - 1;
+if (x2 > DUNGEON_WID - 1) x2 = DUNGEON_WID - 1;
 
 /* Scan the dungeon */
 for (y = y1; y < y2; y++)

r2038 - /trunk/lib/edit/object.txt

2010-08-09T04:15:52

Author: d_m
Date: Mon Aug  9 04:15:49 2010
New Revision: 2038

URL: http://trac.rephial.org/changeset/2038
Log:
ewert's ammo/etc patch, should fix overly common ammo problem

Modified:
    trunk/lib/edit/object.txt

Modified: trunk/lib/edit/object.txt
URL: http://trac.rephial.org/file/trunk/lib/edit/object.txt?rev=2038
==============================================================================
--- trunk/lib/edit/object.txt (original)
+++ trunk/lib/edit/object.txt Mon Aug  9 04:15:49 2010
< at >< at > -640,7 +640,7 < at >< at >
 I:17:1:0
 W:3:0:2:1
 M:100:6d7
-A:50:3 to 100
+A:20:3 to 100
 P:0:1d4:0:0:0
 D:It can be shot with a bow.
 
< at >< at > -648,7 +648,7 < at >< at >
 G:{:G
 I:17:2:0
 W:55:0:2:20
-A:75:55 to 100
+A:25:55 to 100
 M:100:6d7
 P:0:4d4:0:0:0
 D:It can be shot with a bow.
< at >< at > -658,7 +658,7 < at >< at >
 I:17:3:0
 W:55:0:2:25
 M:100:6d7
-A:50:50 to 100
+A:20:50 to 100
 P:0:3d4:0:0:0
 F:IGNORE_ACID | IGNORE_FIRE
 D:It can be shot with a bow.
< at >< at > -669,7 +669,7 < at >< at >
 I:18:1:0
 W:3:0:3:2
 M:100:6d7
-A:50:3 to 100
+A:20:3 to 100
 P:0:1d5:0:0:0
 D:

r2037 - /trunk/src/game-cmd.c

2010-08-08T09:28:17

Author: ajps
Date: Sun Aug  8 09:28:16 2010
New Revision: 2037

URL: http://trac.rephial.org/changeset/2037
Log:
Fix other occurances of the out-of-bounds repeated command bug from r2032.

Modified:
    trunk/src/game-cmd.c

Modified: trunk/src/game-cmd.c
URL: http://trac.rephial.org/file/trunk/src/game-cmd.c?rev=2037
==============================================================================
--- trunk/src/game-cmd.c (original)
+++ trunk/src/game-cmd.c Sun Aug  8 09:28:16 2010
< at >< at > -23,6 +23,7 < at >< at >
 errr (*cmd_get_hook)(cmd_context c, bool wait);
 
 #define CMD_QUEUE_SIZE 20
+#define prev_cmd_idx(idx) ((idx + CMD_QUEUE_SIZE - 1) % CMD_QUEUE_SIZE)
 
 static int cmd_head = 0;
 static int cmd_tail = 0;
< at >< at > -163,7 +164,7 < at >< at >
 /* If we're repeating, just pull the last command again. */
 if (repeating)
 {
-*cmd = cmd_queue[(cmd_tail + CMD_QUEUE_SIZE - 1) % CMD_QUEUE_SIZE];
+*cmd = cmd_queue[prev_cmd_idx(cmd_tail)];
 return 0;
 }
 
< at >< at > -437,7 +438,7 < at >< at >
  */
 void cmd_cancel_repeat(void)
 {
-game_command *cmd

r2036 - in /trunk/src: option.c option.h

2010-08-07T18:53:51

Author: takkaria
Date: Sat Aug  7 18:53:46 2010
New Revision: 2036

URL: http://trac.rephial.org/changeset/2036
Log:
Fix option bug introduced in r2030

Modified:
    trunk/src/option.c
    trunk/src/option.h

Modified: trunk/src/option.c
URL: http://trac.rephial.org/file/trunk/src/option.c?rev=2036
==============================================================================
--- trunk/src/option.c (original)
+++ trunk/src/option.c Sat Aug  7 18:53:46 2010
< at >< at > -87,7 +87,6 < at >< at >
 {
 OPT_birth_maximize,
 OPT_birth_randarts,
-/*OPT_birth_money, */
 OPT_birth_ai_sound,
 OPT_birth_ai_smell,
 OPT_birth_ai_packs,
< at >< at > -100,7 +99,8 < at >< at >
 OPT_birth_no_stacking,
 OPT_birth_no_preserve,
 OPT_birth_no_stairs,
-OPT_birth_feelings
+OPT_birth_feelings,
+OPT_NONE
 },
 
 /* Cheat */
< at >< at > -264,7 +264,7 < at >< at >
 { NULL,                  NULL,                                          FALSE }, /* 127 */
 { "birth_maximize",      "Maximise effect of race/class bonuses",       TRUE },  /* 128 */
 { "birth_randarts",

r2035 - /trunk/src/game-cmd.c

2010-08-06T08:55:01

Author: ajps
Date: Fri Aug  6 08:55:01 2010
New Revision: 2035

URL: http://trac.rephial.org/changeset/2035
Log:
Fix for hang when using an autorepeated command.  Fix typo in comment.

Modified:
    trunk/src/game-cmd.c

Modified: trunk/src/game-cmd.c
URL: http://trac.rephial.org/file/trunk/src/game-cmd.c?rev=2035
==============================================================================
--- trunk/src/game-cmd.c (original)
+++ trunk/src/game-cmd.c Fri Aug  6 08:55:01 2010
< at >< at > -163,7 +163,7 < at >< at >
 /* If we're repeating, just pull the last command again. */
 if (repeating)
 {
-*cmd = cmd_queue[(cmd_tail - 1) % CMD_QUEUE_SIZE];
+*cmd = cmd_queue[(cmd_tail + CMD_QUEUE_SIZE - 1) % CMD_QUEUE_SIZE];
 return 0;
 }
 
< at >< at > -405,7 +405,7 < at >< at >
 /* Command repetition */
 if (game_cmds[idx].repeat_allowed)
 {
-/* Auto-repeat only if their isn't already a repeat length. */
+/* Auto-repeat only if there isn't already a repeat length. */
 if (game_cmds[idx].auto_repeat_n > 0 && cmd.nrepeats == 0)
 {

r2034 - in /trunk/src: dungeon.c pathfind.cplayer/types.h util.c xtra2.c

2010-08-05T19:44:17

Author: ajps
Date: Thu Aug  5 19:44:17 2010
New Revision: 2034

URL: http://trac.rephial.org/changeset/2034
Log:
Remove unused p_ptr->command_dir variable.

Modified:
    trunk/src/dungeon.c
    trunk/src/pathfind.c
    trunk/src/player/types.h
    trunk/src/util.c
    trunk/src/xtra2.c

Modified: trunk/src/dungeon.c
URL: http://trac.rephial.org/file/trunk/src/dungeon.c?rev=2034
==============================================================================
--- trunk/src/dungeon.c (original)
+++ trunk/src/dungeon.c Thu Aug  5 19:44:17 2010
< at >< at > -1344,7 +1344,6 < at >< at >
 p_ptr->command_cmd = 0;
 p_ptr->command_new = 0;
 p_ptr->command_arg = 0;
-p_ptr->command_dir = 0;
 
 
 /* Cancel the target */

Modified: trunk/src/pathfind.c
URL: http://trac.rephial.org/file/trunk/src/pathfind.c?rev=2034
==============================================================================
--- trunk/src/pathfind.c (original)
+++ trunk/src/pathfind.c Thu Aug  5 19:44:17 2010
< at >< at > -1105,9 +1105,6 < at >< at >
 }
 
 p_ptr->run_cur_dir = pf_res

r2033 - /trunk/src/game-cmd.c

2010-08-05T19:37:19

Author: ajps
Date: Thu Aug  5 19:37:17 2010
New Revision: 2033

URL: http://trac.rephial.org/changeset/2033
Log:
Make autorepeated commands work properly again (fixes bug introduced in r2032)

Modified:
    trunk/src/game-cmd.c

Modified: trunk/src/game-cmd.c
URL: http://trac.rephial.org/file/trunk/src/game-cmd.c?rev=2033
==============================================================================
--- trunk/src/game-cmd.c (original)
+++ trunk/src/game-cmd.c Thu Aug  5 19:37:17 2010
< at >< at > -407,7 +407,10 < at >< at >
 {
 /* Auto-repeat only if their isn't already a repeat length. */
 if (game_cmds[idx].auto_repeat_n > 0 && cmd.nrepeats == 0)
+{
 cmd.nrepeats = game_cmds[idx].auto_repeat_n;
+cmd_set_repeat(cmd.nrepeats);
+}
 }
 else
 {