Changeset 1417

Timestamp:

05/31/09 11:15:34 (9 months ago)

Author:

ajps

Message:

Next step in abstracting game commands from the text user interface (#348).
Previous behaviour should be preserved, except for a slight tweak to destroying items.
Various issues are outstanding even on the limited scope of this change, e.g.

• not all do_cmd_* functions affect game state, and so should be renamed to textui_cmd_*.
• Repeated commands are still not implemented in the new system, and use the old repetition system
• UI and game commands are still all mixed into files in an almost random fashion.

Location:

trunk/src

Files:

• Makefile.inc (modified) (1 diff)
• Makefile.src (modified) (1 diff)
• attack.c (modified) (7 diffs)
• birth.c (modified) (8 diffs)
• cmd-obj.c (modified) (16 diffs)
• cmd0.c (modified) (19 diffs)
• cmd1.c (modified) (2 diffs)
• cmd2.c (modified) (42 diffs)
• cmd3.c (modified) (5 diffs)
• cmd5.c (modified) (2 diffs)
• cmd6.c (deleted)
• cmds.h (modified) (4 diffs)
• dungeon.c (modified) (1 diff)
• externs.h (modified) (4 diffs)
• files.c (modified) (3 diffs)
• game-cmd.c (modified) (7 diffs)
• game-cmd.h (modified) (5 diffs)
• gtk/main-gtk.c (modified) (2 diffs)
• main-crb.c (modified) (1 diff)
• main-sdl.c (modified) (1 diff)
• main-win.c (modified) (3 diffs)
• object/obj-ui.c (modified) (1 diff)
• object/obj-util.c (modified) (2 diffs)
• object/object.h (modified) (1 diff)
• spells2.c (modified) (5 diffs)
• store.c (modified) (8 diffs)
• target.c (modified) (3 diffs)
• textui.h (modified) (1 diff)
• ui-birth.c (modified) (3 diffs)
• wizard.c (modified) (1 diff)
• xtra3.c (modified) (1 diff)

trunk/src/Makefile.inc

@@ -20 +20 @@
 ./attack.o: attack.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h game-cmd.h
 ./birth.o: birth.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h game-event.h game-cmd.h ui-menu.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h cmds.h game-cmd.h game-event.h ui-menu.h
 ./button.o: button.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
 ./cave.o: cave.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h game-event.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h game-event.h
 ./cmd0.o: cmd0.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h wizard.h \
-  cmds.h ui-menu.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h wizard.h cmds.h game-cmd.h ui-menu.h
 ./cmd1.o: cmd1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h cmds.h game-cmd.h
 ./cmd2.o: cmd2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h cmds.h game-cmd.h
 ./cmd3.o: cmd3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h cmds.h game-cmd.h
 ./cmd4.o: cmd4.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h ui-menu.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h cmds.h game-cmd.h ui-menu.h
 ./cmd5.o: cmd5.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h
-./cmd6.o: cmd6.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h effects.h list-effects.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h game-cmd.h
 ./cmd-know.o: cmd-know.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h ui-menu.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h ui-menu.h
 ./cmd-obj.o: cmd-obj.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h cmds.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h game-cmd.h cmds.h effects.h \
+  list-effects.h
 ./death.o: death.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  ui-menu.h cmds.h wizard.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h ui-menu.h cmds.h game-cmd.h wizard.h
 ./debug.o: debug.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h debug.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h debug.h
 ./dungeon.o: dungeon.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h cmds.h game-event.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h cmds.h game-cmd.h \
+  game-event.h
 ./effects.o: effects.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h effects.h list-effects.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h effects.h list-effects.h
 ./files.o: files.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h ui-menu.h cmds.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h ui-menu.h game-cmd.h cmds.h
 ./game-cmd.o: game-cmd.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h game-cmd.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h game-cmd.h cmds.h
 ./game-event.o: game-event.c z-virt.h h-basic.h game-event.h
 ./generate.o: generate.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
 ./history.o: history.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./init1.o: init1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h effects.h list-effects.h \
+  monster/constants.h init.h
+./init2.o: init2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h init.h cmds.h game-cmd.h game-event.h
+./load.o: load.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h object/tvalsval.h savefile.h
+./load-old.o: load-old.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./monster/melee1.o: monster/melee1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./monster/melee2.o: monster/melee2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h bitflag.h object/tvalsval.h monster/constants.h
+./monster/monster1.o: monster/monster1.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./monster/monster2.o: monster/monster2.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./object/identify.o: object/identify.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./object/obj-desc.o: object/obj-desc.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./object/obj-info.o: object/obj-info.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h effects.h list-effects.h cmds.h game-cmd.h \
+  object/tvalsval.h
+./object/obj-make.o: object/obj-make.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./object/obj-power.o: object/obj-power.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h init.h effects.h \
+  list-effects.h
+./object/obj-ui.o: object/obj-ui.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./object/obj-util.o: object/obj-util.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h randname.h object/tvalsval.h effects.h \
+  list-effects.h
+./object/randart.o: object/randart.c angband.h h-basic.h z-file.h z-form.h \
+  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
+  config.h defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h init.h randname.h
+./option.o: option.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./randname.o: randname.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h randname.h
+./pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./prefs.o: prefs.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
   monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
   externs.h
-./init1.o: init1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h effects.h list-effects.h monster/constants.h init.h
-./init2.o: init2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h init.h \
-  cmds.h game-event.h game-cmd.h
-./load.o: load.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  object/tvalsval.h savefile.h
-./load-old.o: load-old.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./monster/melee1.o: monster/melee1.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./monster/melee2.o: monster/melee2.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h bitflag.h object/tvalsval.h monster/constants.h
-./monster/monster1.o: monster/monster1.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./monster/monster2.o: monster/monster2.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./object/identify.o: object/identify.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./object/obj-desc.o: object/obj-desc.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./object/obj-info.o: object/obj-info.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h effects.h list-effects.h cmds.h object/tvalsval.h
-./object/obj-make.o: object/obj-make.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./object/obj-power.o: object/obj-power.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h init.h h-basic.h
-./object/obj-ui.o: object/obj-ui.c angband.h h-basic.h z-file.h h-basic.h z-form.h \
-  h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h h-basic.h \
-  z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./object/obj-util.o: object/obj-util.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h randname.h object/tvalsval.h
-./object/randart.o: object/randart.c angband.h h-basic.h z-file.h h-basic.h \
-  z-form.h h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h \
-  h-basic.h z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h \
-  config.h defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h init.h h-basic.h randname.h
-./option.o: option.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
+./player/calcs.o: player/calcs.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h game-event.h object/tvalsval.h
+./player/timed.o: player/timed.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./player/util.o: player/util.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./score.o: score.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
   monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
   externs.h
-./randname.o: randname.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h randname.h
-./pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
+./signals.o: signals.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
+./save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h savefile.h
+./savefile.o: savefile.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h savefile.h
+./spells1.o: spells1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h monster/constants.h
+./spells2.o: spells2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./squelch.o: squelch.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h cmds.h game-cmd.h ui-menu.h object/tvalsval.h
+./store.o: store.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h cmds.h game-cmd.h ui-menu.h game-event.h object/tvalsval.h
+./tables.o: tables.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h object/tvalsval.h
+./target.o: target.c angband.h h-basic.h z-file.h z-form.h z-util.h \
+  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h game-cmd.h
+./trap.o: trap.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
   monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
   externs.h
-./prefs.o: prefs.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h
-./player/calcs.o: player/calcs.c angband.h h-basic.h z-file.h h-basic.h z-form.h \
-  h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h h-basic.h \
-  z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h game-event.h object/tvalsval.h
-./player/timed.o: player/timed.c angband.h h-basic.h z-file.h h-basic.h z-form.h \
-  h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h h-basic.h \
-  z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
+./ui.o: ui.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
+  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
+  option.h types.h object/constants.h object/types.h object/object.h \
   monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
   externs.h
-./player/util.o: player/util.c angband.h h-basic.h z-file.h h-basic.h z-form.h \
-  h-basic.h z-util.h h-basic.h z-virt.h h-basic.h z-rand.h h-basic.h \
-  z-term.h h-basic.h ui-event.h z-quark.h z-msg.h h-basic.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h
-./score.o: score.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h
-./signals.o: signals.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h
-./save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  savefile.h
-./savefile.o: savefile.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h savefile.h
-./spells1.o: spells1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h monster/constants.h
-./spells2.o: spells2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./squelch.o: squelch.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h cmds.h ui-menu.h object/tvalsval.h
-./store.o: store.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h cmds.h \
-  ui-menu.h game-event.h object/tvalsval.h
-./tables.o: tables.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h object/tvalsval.h
-./target.o: target.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h cmds.h
-./trap.o: trap.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h
-./ui.o: ui.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h
 ./ui-birth.o: ui-birth.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h ui-menu.h ui-birth.h game-event.h game-cmd.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h ui-menu.h ui-birth.h game-event.h game-cmd.h \
+  cmds.h
 ./ui-event.o: ui-event.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
 ./ui-menu.o: ui-menu.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h ui-menu.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h ui-menu.h
 ./util.o: util.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  game-event.h randname.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h game-event.h randname.h
 ./variable.o: variable.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h
 ./wiz-spoil.o: wiz-spoil.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h wizard.h cmds.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h wizard.h cmds.h game-cmd.h object/tvalsval.h
 ./wiz-stats.o: wiz-stats.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h cmds.h wizard.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h cmds.h game-cmd.h wizard.h object/tvalsval.h
 ./wizard.o: wizard.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h wizard.h cmds.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h wizard.h cmds.h game-cmd.h object/tvalsval.h
 ./x-spell.o: x-spell.c angband.h h-basic.h z-file.h z-form.h z-util.h \
   z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h object/object.h \
-  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
-  externs.h effects.h list-effects.h object/tvalsval.h
+  defines.h option.h types.h object/constants.h object/types.h \
+  object/object.h monster/types.h player/types.h player/player.h store.h \
+  ui.h z-type.h externs.h effects.h list-effects.h object/tvalsval.h
 ./xtra2.o: xtra2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h cmds.h \
-  object/tvalsval.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h cmds.h game-cmd.h object/tvalsval.h
 ./xtra3.o: xtra3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
   z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h object/object.h monster/types.h \
-  player/types.h player/player.h store.h ui.h z-type.h externs.h \
-  game-event.h ui-birth.h object/tvalsval.h
+  option.h types.h object/constants.h object/types.h object/object.h \
+  monster/types.h player/types.h player/player.h store.h ui.h z-type.h \
+  externs.h game-event.h game-cmd.h textui.h ui-birth.h object/tvalsval.h
 ./z-file.o: z-file.c z-file.h h-basic.h z-virt.h z-util.h z-form.h
 ./z-form.o: z-form.c z-form.h h-basic.h z-type.h z-util.h z-virt.h

trunk/src/Makefile.src

@@ -63 +63 @@
         cmd4.o \
         cmd5.o \
-        cmd6.o \
         cmd-know.o \
         cmd-obj.o \

trunk/src/attack.c

@@ -20 +20 @@
 #include "object/object.h"
 #include "object/tvalsval.h"
-
+#include "game-cmd.h"
 
 /**
@@ -465 +465 @@
  * for the damage multiplier.
  */
-void do_cmd_fire(void)
+void do_cmd_fire(cmd_code code, cmd_arg args[])
 {
         int dir, item;
@@ -489 +489 @@
         u16b path_g[256];
 
-        cptr q, s;
-
         int msec = op_ptr->delay_factor * op_ptr->delay_factor;
 
-
-        /* Get the "bow" (if any) */
+        /* Get item to fire and direction to fire in. */
+        item = args[0].item;
+        dir = args[1].direction;
+
+        /* Get the object for the ammo */
+        o_ptr = object_from_item_idx(item);
+
+        /* Get the "bow" */
         j_ptr = &inventory[INVEN_BOW];
-
-        /* Require a usable launcher */
-        if (!j_ptr->tval || !p_ptr->state.ammo_tval)
-        {
-                msg_print("You have nothing to fire with.");
-                return;
-        }
-
-
-        /* Require proper missile */
-        item_tester_tval = p_ptr->state.ammo_tval;
-
-        /* Get an item */
-        q = "Fire which item? ";
-        s = "You have nothing to fire.";
-        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-        /* Get the object */
-        if (item >= 0)
-        {
-                o_ptr = &inventory[item];
-        }
-        else
-        {
-                o_ptr = &o_list[0 - item];
-        }
-
-        /* Get a direction (or cancel) */
-        if (!get_aim_dir(&dir)) return;
 
         /* Base range XXX XXX */
@@ -760 +735 @@
 }
 
-
+void textui_cmd_fire(void)
+{
+        object_type *j_ptr, *o_ptr;
+        int item;
+        int dir;
+        cptr q, s;
+
+
+        /* Get the "bow" (if any) */
+        j_ptr = &inventory[INVEN_BOW];
+
+        /* Require a usable launcher */
+        if (!j_ptr->tval || !p_ptr->state.ammo_tval)
+        {
+                msg_print("You have nothing to fire with.");
+                return;
+        }
+
+        /* Require proper missile */
+        item_tester_tval = p_ptr->state.ammo_tval;
+
+        /* Get an item */
+        q = "Fire which item? ";
+        s = "You have nothing to fire.";
+        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+
+        /* Get the object */
+        o_ptr = object_from_item_idx(item);
+
+        /* Get a direction (or cancel) */
+        if (!get_aim_dir(&dir)) return;
+
+        cmd_insert(CMD_FIRE, item, dir);
+}
 
 /*
@@ -771 +779 @@
  * the item to be destroyed?  Should it do any damage at all?
  */
-void do_cmd_throw(void)
+void do_cmd_throw(cmd_code code, cmd_arg args[])
 {
         int dir, item;
@@ -794 +802 @@
         u16b path_g[256];
 
-        cptr q, s;
-
         int msec = op_ptr->delay_factor * op_ptr->delay_factor;
 
-
-        /* Get an item */
-        q = "Throw which item? ";
-        s = "You have nothing to throw.";
-        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+        /* Get item to throw and direction in which to throw it. */
+        item = args[0].item;
+        dir = args[1].direction;
 
         /* Get the object */
-        if (item >= 0)
-        {
-                o_ptr = &inventory[item];
-        }
-        else
-        {
-                o_ptr = &o_list[0 - item];
-        }
-
-
-        /* Get a direction (or cancel) */
-        if (!get_aim_dir(&dir)) return;
-
+        o_ptr = object_from_item_idx(item);
 
         /* Get local object */
@@ -1047 +1039 @@
         drop_near(i_ptr, j, y, x);
 }
+
+void textui_cmd_throw(void)
+{
+        int item, dir;
+        cptr q, s;
+
+        /* Get an item */
+        q = "Throw which item? ";
+        s = "You have nothing to throw.";
+        if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+
+        /* Get a direction (or cancel) */
+        if (!get_aim_dir(&dir)) return;
+
+        cmd_insert(CMD_THROW, item, dir);
+}

trunk/src/birth.c

@@ -1001 +1001 @@
 {
         int i;
-        game_command cmd = { CMD_NULL, 0, {0} };
+        game_command cmd = { CMD_NULL, 0, {{0}} };
 
         int stats[A_MAX];
@@ -1060 +1060 @@
                 else if (cmd.command == CMD_CHOOSE_SEX)
                 {
-                        p_ptr->psex = cmd.params.choice; 
+                        p_ptr->psex = cmd.args[0].choice; 
                         generate_player();
                 }
                 else if (cmd.command == CMD_CHOOSE_RACE)
                 {
-                        p_ptr->prace = cmd.params.choice;
+                        p_ptr->prace = cmd.args[0].choice;
                         generate_player();
 
@@ -1074 +1074 @@
                 else if (cmd.command == CMD_CHOOSE_CLASS)
                 {
-                        p_ptr->pclass = cmd.params.choice;
+                        p_ptr->pclass = cmd.args[0].choice;
                         generate_player();
 
@@ -1085 +1085 @@
                         /* .choice is the stat to buy */
                         if (!rolled_stats)
-                                buy_stat(cmd.params.choice, stats, points_spent, &points_left);
+                                buy_stat(cmd.args[0].choice, stats, points_spent, &points_left);
                 }
                 else if (cmd.command == CMD_SELL_STAT)
@@ -1091 +1091 @@
                         /* .choice is the stat to sell */
                         if (!rolled_stats)
-                                sell_stat(cmd.params.choice, stats, points_spent, &points_left);
+                                sell_stat(cmd.args[0].choice, stats, points_spent, &points_left);
                 }
                 else if (cmd.command == CMD_RESET_STATS)
@@ -1098 +1098 @@
                         reset_stats(stats, points_spent, &points_left);
 
-                        if (cmd.params.choice)
+                        if (cmd.args[0].choice)
                                 generate_stats(stats, points_spent, &points_left);
 
@@ -1157 +1157 @@
                 {
                         /* Set player name */
-                        my_strcpy(op_ptr->full_name, cmd.params.string, 
+                        my_strcpy(op_ptr->full_name, cmd.args[0].string, 
                                           sizeof(op_ptr->full_name));
                         
-                        string_free((void *) cmd.params.string);
+                        string_free((void *) cmd.args[0].string);
                         
                         /* Don't change savefile name.  If the UI
@@ -1167 +1167 @@
                 }
                 /* Various not-specific-to-birth commands. */
-                else if (cmd.command == CMD_OPTIONS) 
-                {
-                        /* TODO: Change this to use whatever sort of message passing
-                           system we eventually decide on for options.  That might
-                           still be calling do_cmd_option. :) */
-                        do_cmd_options();
-                }
                 else if (cmd.command == CMD_HELP)
                 {

trunk/src/cmd-obj.c

@@ -19 +19 @@
 #include "angband.h"
 #include "object/tvalsval.h"
+#include "object/object.h"
+#include "game-cmd.h"
 #include "cmds.h"
+#include "effects.h"
+
+/*** Utility bits and bobs ***/
+/*
+ * Check to see if the player can use a rod/wand/staff/activatable object.
+ */
+static int check_devices(object_type *o_ptr)
+{
+        int lev, chance;
+        const char *msg;
+        const char *what = NULL;
+
+        /* Get the right string */
+        switch (o_ptr->tval)
+        {
+                case TV_ROD:   msg = "zap the rod";   break;
+                case TV_WAND:  msg = "use the wand";  what = "wand";  break;
+                case TV_STAFF: msg = "use the staff"; what = "staff"; break;
+                default:       msg = "activate it";  break;
+        }
+
+        /* Extract the item level */
+        if (artifact_p(o_ptr))
+                lev = a_info[o_ptr->name1].level;
+        else
+                lev = k_info[o_ptr->k_idx].level;
+
+        /* Base chance of success */
+        chance = p_ptr->state.skills[SKILL_DEVICE];
+
+        /* Confusion hurts skill */
+        if (p_ptr->timed[TMD_CONFUSED] || p_ptr->timed[TMD_AMNESIA])
+                chance = chance / 2;
+
+        /* High level objects are harder */
+        chance -= MIN(lev, 50);
+
+        /* Give everyone a (slight) chance */
+        if ((chance < USE_DEVICE) && one_in_(USE_DEVICE - chance + 1))
+        {
+                chance = USE_DEVICE;
+        }
+
+        /* Roll for usage */
+        if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE))
+        {
+                if (OPT(flush_failure)) flush();
+                msg_format("You failed to %s properly.", msg);
+                return FALSE;
+        }
+
+        /* Notice empty staffs */
+        if (what && o_ptr->pval <= 0)
+        {
+                if (OPT(flush_failure)) flush();
+                msg_format("The %s has no charges left.", what);
+                o_ptr->ident |= (IDENT_EMPTY);
+                return FALSE;
+        }
+
+        return TRUE;
+}
+
+/*
+ * Return the chance of an effect beaming, given a tval.
+ */
+static int beam_chance(int tval)
+{
+        switch (tval)
+        {
+                case TV_WAND: return 20;
+                case TV_ROD:  return 10;
+        }
+
+        return 0;
+}
+
+
+typedef enum { 
+        ART_TAG_NONE, 
+        ART_TAG_NAME, 
+        ART_TAG_KIND, 
+        ART_TAG_VERB, 
+        ART_TAG_VERB_IS 
+} art_tag_t;
+
+static art_tag_t art_tag_lookup(const char *tag)
+{
+        if (strncmp(tag, "name", 4) == 0)
+                return ART_TAG_NAME;
+        else if (strncmp(tag, "kind", 4) == 0)
+                return ART_TAG_KIND;
+        else if (strncmp(tag, "s", 1) == 0)
+                return ART_TAG_VERB;
+        else if (strncmp(tag, "is", 2) == 0)
+                return ART_TAG_VERB_IS;
+        else
+                return ART_TAG_NONE;
+}
+
+/*
+ * Print an artifact activation message.
+ * 
+ * In order to support randarts, with scrambled names, we re-write
+ * the message to replace instances of {name} with the artifact name
+ * and instances of {kind} with the type of object.
+ *
+ * This code deals with plural and singular forms of verbs correctly 
+ * when encountering {s}, though in fact both names and kinds are 
+ * always singular in the current code (gloves are "Set of" and boots
+ * are "Pair of")
+ */
+static void activation_message(object_type *o_ptr, const char *message)
+{
+        char buf[1024] = "\0";
+        const char *next;
+        const char *s;
+        const char *tag;
+        const char *in_cursor;
+        size_t end = 0;
+ 
+        in_cursor = message;
+ 
+        next = strchr(in_cursor, '{');
+        while (next)
+        {
+                /* Copy the text leading up to this { */
+                strnfcat(buf, 1024, &end, "%.*s", next - in_cursor, in_cursor); 
+
+                s = next + 1;
+                while (*s && isalpha((unsigned char) *s)) s++;
+
+                if (*s == '}')          /* Valid tag */
+                {
+                        tag = next + 1; /* Start the tag after the { */
+                        in_cursor = s + 1;
+ 
+                        switch(art_tag_lookup(tag))
+                        {
+                        case ART_TAG_NAME:
+                                end += object_desc(buf, 1024, o_ptr, TRUE, ODESC_BASE); 
+                                break;
+                        case ART_TAG_KIND:
+                                object_kind_name(&buf[end], 1024-end, o_ptr->k_idx, TRUE);
+                                end += strlen(&buf[end]);
+                                break;
+                        case ART_TAG_VERB:
+                                strnfcat(buf, 1024, &end, "s");
+                                break;
+                        case ART_TAG_VERB_IS:
+                                if((end > 2) && (buf[end-2] == 's'))
+                                        strnfcat(buf, 1024, &end, "are");
+                                else
+                                        strnfcat(buf, 1024, &end, "is");
+                        default:
+                                break;
+                        }
+                }
+                else    /* An invalid tag, skip it */
+                {
+                        in_cursor = next + 1;
+                } 
+
+                next = strchr(in_cursor, '{');
+        }
+        strnfcat(buf, 1024, &end, in_cursor);
+ 
+        msg_print(buf);
+} 
+
 
 
 /*** Inscriptions ***/
 
-/* Can has inscrip pls */
-static bool obj_has_inscrip(const object_type *o_ptr)
-{
-        return (o_ptr->note ? TRUE : FALSE);
-}
-
 /* Remove inscription */
-static void obj_uninscribe(object_type *o_ptr, int item)
-{
+void do_cmd_uninscribe(cmd_code code, cmd_arg args[])
+{
+        object_type *o_ptr = object_from_item_idx(args[0].item);
+
         o_ptr->note = 0;
         msg_print("Inscription removed.");
@@ -41 +209 @@
 
 /* Add inscription */
+void do_cmd_inscribe(cmd_code code, cmd_arg args[])
+{
+        object_type *o_ptr = object_from_item_idx(args[0].item);
+        
+        o_ptr->note = quark_add(args[1].string);
+
+        p_ptr->notice |= (PN_COMBINE | PN_SQUELCH);
+        p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
+}
+
 static void obj_inscribe(object_type *o_ptr, int item)
 {
@@ -57 +235 @@
         if (get_string("Inscription: ", tmp, sizeof(tmp)))
         {
-                o_ptr->note = quark_add(tmp);
-
-                p_ptr->notice |= (PN_COMBINE | PN_SQUELCH);
-                p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
+                cmd_insert(CMD_INSCRIBE, item, tmp);
         }
 }
@@ -85 +260 @@
 /*** Taking off/putting on ***/
 
-/* Can only take off non-cursed items */
-static bool obj_can_takeoff(const object_type *o_ptr)
-{
-        return !cursed_p(o_ptr);
-}
-
-/* Can only put on wieldable items */
-static bool obj_can_wear(const object_type *o_ptr)
-{
-        return (wield_slot(o_ptr) >= INVEN_WIELD);
-}
-
-
 /* Take off an item */
-static void obj_takeoff(object_type *o_ptr, int item)
-{
+void do_cmd_takeoff(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+
         (void)inven_takeoff(item, 255);
         p_ptr->energy_use = 50;
@@ -106 +270 @@
 
 /* Wield or wear an item */
-static void obj_wear(object_type *o_ptr, int item)
+void do_cmd_wield(cmd_code code, cmd_arg args[])
 {
         int slot;
@@ -114 +278 @@
 
         unsigned n;
+        
+        int item = args[0].item;
+        
+        object_type *o_ptr = object_from_item_idx(item);
 
         /* Check the slot */
@@ -149 +317 @@
 
 /* Drop an item */
-static void obj_drop(object_type *o_ptr, int item)
-{
+void do_cmd_drop(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        object_type *o_ptr = object_from_item_idx(item);
         int amt;
 
@@ -170 +340 @@
 /*** Casting and browsing ***/
 
-static bool obj_can_browse(const object_type *o_ptr)
-{
-        if (o_ptr->tval != cp_ptr->spell_book) return FALSE;
-        return TRUE;
-}
-
-
 static bool obj_cast_pre(void)
 {
@@ -226 +389 @@
 static void obj_study(object_type *o_ptr, int item)
 {
-        int spell;
-
         /* Track the object kind */
         object_kind_track(o_ptr->k_idx);
         handle_stuff();
 
-        /* Choose a spell to study */
-        spell = spell_choose_new(o_ptr);
-        if (spell < 0) return;
-
-        /* Learn the spell */
-        spell_learn(spell);
-        p_ptr->energy_use = 100;
+        /* Mage -- Choose a spell to study */
+        if (cp_ptr->flags & CF_CHOOSE_SPELLS)
+        {
+                int spell = get_spell(o_ptr, "study", FALSE, FALSE);
+                if (spell >= 0)
+                        cmd_insert(CMD_STUDY_SPELL, spell);
+        }
+        /* Priest -- Choose a book to study */
+        else
+        {
+                cmd_insert(CMD_STUDY_BOOK, item);
+        }
 }
 
 /* Cast a spell from a book */
+void do_cmd_cast(cmd_code code, cmd_arg args[])
+{
+        int spell = args[0].choice;
+
+        /* Cast a spell */
+        if (spell_cast(spell))
+            p_ptr->energy_use = 100;
+}
+
 static void obj_cast(object_type *o_ptr, int item)
 {
@@ -261 +436 @@
         }
 
-        /* Cast a spell */
-        if (spell_cast(spell))
-            p_ptr->energy_use = 100;
+        cmd_insert(CMD_CAST, spell);
 }
 
@@ -299 +472 @@
 }
 
-/* Basic tval testers */
-static bool obj_is_staff(const object_type *o_ptr)  { return o_ptr->tval == TV_STAFF; }
-static bool obj_is_wand(const object_type *o_ptr)   { return o_ptr->tval == TV_WAND; }
-static bool obj_is_potion(const object_type *o_ptr) { return o_ptr->tval == TV_POTION; }
-static bool obj_is_scroll(const object_type *o_ptr) { return o_ptr->tval == TV_SCROLL; }
-static bool obj_is_food(const object_type *o_ptr)   { return o_ptr->tval == TV_FOOD; }
-
-/* Determine if an object is zappable */
-static bool obj_can_zap(const object_type *o_ptr)
-{
-        const object_kind *k_ptr = &k_info[o_ptr->k_idx];
-        if (o_ptr->tval != TV_ROD) return FALSE;
-
-        /* All still charging? */
-        if (o_ptr->number <= (o_ptr->timeout + (k_ptr->time_base - 1)) / k_ptr->time_base) return FALSE;
-
-        /* Otherwise OK */
-        return TRUE;
-}
-
-/* Determine if an object is activatable */
-static bool obj_can_activate(const object_type *o_ptr)
-{
-        u32b f[OBJ_FLAG_N];
-
-        /* Not known */
-        if (!object_known_p(o_ptr)) return (FALSE);
-
-        /* Check the recharge */
-        if (o_ptr->timeout) return (FALSE);
-
-        /* Extract the flags */
-        object_flags(o_ptr, f);
-
-        /* Check activation flag */
-        return (f[2] & TR2_ACTIVATE) ? TRUE : FALSE;
-}
-
-
-/* Use a staff */
-static void obj_use_staff(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_USE_STAFF, USE_CHARGE);
-}
-
-/* Aim a wand */
-static void obj_use_wand(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_ZAP_ROD, USE_CHARGE);
-}
-
-/* Zap a rod */
-static void obj_use_rod(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_ZAP_ROD, USE_TIMEOUT);
-}
-
-/* Activate a wielded object */
-static void obj_activate(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_ACT_ARTIFACT, USE_TIMEOUT);
-}
-
-/* Eat some food */
-static void obj_use_food(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_EAT, USE_SINGLE);
-}
-
-/* Quaff a potion (from the pack or the floor) */
-static void obj_use_potion(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_QUAFF, USE_SINGLE);
-}
-
-/* Read a scroll (from the pack or floor) */
-static void obj_use_scroll(object_type *o_ptr, int item)
-{
-        do_cmd_use(o_ptr, item, MSG_GENERIC, USE_SINGLE);
+
+/*
+ * Use an object the right way.
+ *
+ * There may be a BIG problem with any "effect" that can cause "changes"
+ * to the inventory.  For example, a "scroll of recharging" can cause
+ * a wand/staff to "disappear", moving the inventory up.  Luckily, the
+ * scrolls all appear BEFORE the staffs/wands, so this is not a problem.
+ * But, for example, a "staff of recharging" could cause MAJOR problems.
+ * In such a case, it will be best to either (1) "postpone" the effect
+ * until the end of the function, or (2) "change" the effect, say, into
+ * giving a staff "negative" charges, or "turning a staff into a stick".
+ * It seems as though a "rod of recharging" might in fact cause problems.
+ * The basic problem is that the act of recharging (and destroying) an
+ * item causes the inducer of that action to "move", causing "o_ptr" to
+ * no longer point at the correct item, with horrifying results.
+ */
+void do_cmd_use(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        object_type *o_ptr = object_from_item_idx(item);
+        int effect;
+        bool ident = FALSE, used;
+        bool was_aware = object_aware_p(o_ptr);
+        int dir = 5;
+        int px = p_ptr->px, py = p_ptr->py;
+        int snd;
+        use_type use;
+
+        /* Determine how this item is used. */
+        if (obj_is_rod(o_ptr))
+        {
+                use = USE_TIMEOUT;
+                snd = MSG_ZAP_ROD;
+        }
+        else if (obj_is_wand(o_ptr))
+        {
+                use = USE_CHARGE;
+                snd = MSG_ZAP_ROD;
+        }
+        else if (obj_is_staff(o_ptr))
+        {       
+                use = USE_CHARGE;
+                snd = MSG_ZAP_ROD;
+        }
+        else if (obj_is_food(o_ptr))
+        {
+                use = USE_SINGLE;
+                snd = MSG_EAT;          
+        }
+        else if (obj_is_potion(o_ptr))
+        {
+                use = USE_SINGLE;
+                snd = MSG_QUAFF;                
+        }
+        else if (obj_is_scroll(o_ptr))
+        {
+                use = USE_SINGLE;
+                snd = MSG_GENERIC;              
+        }
+        else if (obj_can_activate(o_ptr))
+        {
+                use = USE_TIMEOUT;
+                snd = MSG_ACT_ARTIFACT;         
+        }
+
+        /* Figure out effect to use */
+        if (o_ptr->name1)
+                effect = a_info[o_ptr->name1].effect;
+        else
+                effect = k_info[o_ptr->k_idx].effect;
+
+        /* If the item requires a direction, get one (allow cancelling) */      
+        if (obj_needs_aim(o_ptr))
+        {
+                /* Get a direction, allow cancel */
+                if (!get_aim_dir(&dir))
+                        return;
+        }
+
+        /* Use energy regardless of failure */
+        p_ptr->energy_use = 100;
+
+        /* Check for use */
+        if (use == USE_CHARGE || use == USE_TIMEOUT)
+        {
+                if (!check_devices(o_ptr))
+                        return;
+        }
+
+        /* Special message for artifacts */
+        if (artifact_p(o_ptr))
+        {
+                message(snd, 0, "You activate it.");
+                activation_message(o_ptr, a_text + a_info[o_ptr->name1].effect_msg);
+        }
+        else
+        {
+                /* Make a noise! */
+                sound(snd);
+        }
+
+        /* A bit of a hack to make ID work better.
+           -- Check for "obvious" effects beforehand. */
+        if (effect_obvious(effect)) object_aware(o_ptr);
+
+        /* Do effect */
+        used = effect_do(effect, &ident, was_aware, dir, beam_chance(o_ptr->tval));
+
+        /* Food feeds the player */
+        if (o_ptr->tval == TV_FOOD || o_ptr->tval == TV_POTION)
+                (void)set_food(p_ptr->food + o_ptr->pval);
+
+        if (!used && !ident) return;
+
+        /* Mark as tried and redisplay */
+        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+        p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
+
+
+        /*
+         * If the player becomes aware of the item's function, then mark it as
+         * aware and reward the player with some experience.  Otherwise, mark
+         * it as "tried".
+         */
+        if (ident && !was_aware)
+        {
+                /* Object level */
+                int lev = k_info[o_ptr->k_idx].level;
+
+                object_aware(o_ptr);
+                if (o_ptr->tval == TV_ROD) object_known(o_ptr);
+                gain_exp((lev + (p_ptr->lev / 2)) / p_ptr->lev);
+                p_ptr->notice |= PN_SQUELCH;
+        }
+        else
+        {
+                object_tried(o_ptr);
+        }
+
+        /* Chargeables act differently to single-used items when not used up */
+        if (used && use == USE_CHARGE)
+        {
+                /* Use a single charge */
+                o_ptr->pval--;
+
+                /* Describe charges */
+                if (item >= 0)
+                        inven_item_charges(item);
+                else
+                        floor_item_charges(0 - item);
+        }
+        else if (used && use == USE_TIMEOUT)
+        {
+                /* Artifacts use their own special field */
+                if (o_ptr->name1)
+                {
+                        const artifact_type *a_ptr = &a_info[o_ptr->name1];
+                        o_ptr->timeout = a_ptr->time_base + damroll(a_ptr->time_dice, a_ptr->time_sides);
+                }
+                else
+                {
+                        const object_kind *k_ptr = &k_info[o_ptr->k_idx];
+                        o_ptr->timeout += k_ptr->time_base + damroll(k_ptr->time_dice, k_ptr->time_sides);
+                }
+        }
+        else if (used && use == USE_SINGLE)
+        {
+                /* Destroy a potion in the pack */
+                if (item >= 0)
+                {
+                        inven_item_increase(item, -1);
+                        inven_item_describe(item);
+                        inven_item_optimize(item);
+                }
+
+                /* Destroy a potion on the floor */
+                else
+                {
+                        floor_item_increase(0 - item, -1);
+                        floor_item_describe(0 - item);
+                        floor_item_optimize(0 - item);
+                }
+        }
+        
+        /* Hack to make Glyph of Warding work properly */
+        if (cave_feat[py][px] == FEAT_GLYPH)
+        {
+                /* Shift any objects to further away */
+                for (o_ptr = get_first_object(py, px); o_ptr; o_ptr = get_next_object(o_ptr))
+                {
+                        drop_near(o_ptr, 0, py, px);
+                }
+                
+                /* Delete the "moved" objects from their original position */
+                delete_object(py, px);
+        }
+
+        
 }
 
@@ -405 +698 @@
 }
 
-static bool obj_can_refill(const object_type *o_ptr)
-{
-        u32b f[OBJ_FLAG_N];
-        const object_type *j_ptr = &inventory[INVEN_LITE];
-
-        /* Get flags */
-        object_flags(o_ptr, f);
-
-        if (j_ptr->sval == SV_LITE_LANTERN)
-        {
-                /* Flasks of oil are okay */
-                if (o_ptr->tval == TV_FLASK) return (TRUE);
-        }
-
-        /* Non-empty, non-everburning sources are okay */
-        if ((o_ptr->tval == TV_LITE) &&
-            (o_ptr->sval == j_ptr->sval) &&
-            (o_ptr->timeout > 0) &&
-                !(f[2] & TR2_NO_FUEL))
-        {
-                return (TRUE);
-        }
-
-        /* Assume not okay */
-        return (FALSE);
-}
-
-static void obj_refill(object_type *o_ptr, int item)
+void do_cmd_refill(cmd_code code, cmd_arg args[])
 {
         object_type *j_ptr = &inventory[INVEN_LITE];
+        int item = args[0].item;
+        object_type *o_ptr = object_from_item_idx(item);
         p_ptr->energy_use = 50;
 
@@ -448 +716 @@
 
 
-
 /*** Handling bits ***/
 
@@ -455 +722 @@
 {
         void (*action)(object_type *, int);
+        cmd_code command;
         const char *desc;
 
@@ -472 +740 @@
          * dangerous command to not be prompted, later.
          */
-        { obj_uninscribe, "uninscribe",
+        { NULL, CMD_UNINSCRIBE, "uninscribe",
           "Un-inscribe which item? ", "You have nothing to un-inscribe.",
           obj_has_inscrip, (USE_EQUIP | USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_inscribe, "inscribe",
+        { obj_inscribe, CMD_NULL, "inscribe",
           "Inscribe which item? ", "You have nothing to inscribe.",
           NULL, (USE_EQUIP | USE_INVEN | USE_FLOOR | IS_HARMLESS), NULL },
 
-        { obj_examine, "examine",
+        { obj_examine, CMD_NULL, "examine",
           "Examine which item? ", "You have nothing to examine.",
           NULL, (USE_EQUIP | USE_INVEN | USE_FLOOR | IS_HARMLESS), NULL },
 
         /*** Takeoff/drop/wear ***/
-        { obj_takeoff, "takeoff",
+        { NULL, CMD_TAKEOFF, "takeoff",
           "Take off which item? ", "You are not wearing anything you can take off.",
           obj_can_takeoff, USE_EQUIP, NULL },
 
-        { obj_wear, "wield",
+        { NULL, CMD_WIELD, "wield",
           "Wear/Wield which item? ", "You have nothing you can wear or wield.",
           obj_can_wear, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_drop, "drop",
+        { NULL, CMD_DROP, "drop",
           "Drop which item? ", "You have nothing to drop.",
           NULL, (USE_EQUIP | USE_INVEN), NULL },
 
         /*** Spellbooks ***/
-        { obj_browse, "browse",
+        { obj_browse, CMD_NULL, "browse",
           "Browse which book? ", "You have no books that you can read.",
           obj_can_browse, (USE_INVEN | USE_FLOOR | IS_HARMLESS), NULL },
 
-        { obj_study, "study",
+        { obj_study, CMD_NULL, "study",
           "Study which book? ", "You have no books that you can read.",
           obj_can_browse, (USE_INVEN | USE_FLOOR), obj_study_pre },
 
-        { obj_cast, "cast",
+        { obj_cast, CMD_NULL, "cast",
           "Use which book? ", "You have no books that you can read.",
           obj_can_browse, (USE_INVEN | USE_FLOOR), obj_cast_pre },
 
         /*** Item usage ***/
-        { obj_use_staff, "use",
+        { NULL, CMD_USE_STAFF, "use",
           "Use which staff? ", "You have no staff to use.",
           obj_is_staff, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_use_wand, "aim",
+        { NULL, CMD_USE_WAND, "aim",
       "Aim which wand? ", "You have no wand to aim.",
           obj_is_wand, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_use_rod, "zap",
+        { NULL, CMD_USE_ROD, "zap",
       "Zap which rod? ", "You have no charged rods to zap.",
           obj_can_zap, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_activate, "activate",
+        { NULL, CMD_ACTIVATE, "activate",
       "Activate which item? ", "You have nothing to activate.",
           obj_can_activate, USE_EQUIP, NULL },
 
-        { obj_use_food, "eat",
+        { NULL, CMD_EAT, "eat",
       "Eat which item? ", "You have nothing to eat.",
           obj_is_food, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_use_potion, "quaff",
+        { NULL, CMD_QUAFF, "quaff",
       "Quaff which potion? ", "You have no potions to quaff.",
           obj_is_potion, (USE_INVEN | USE_FLOOR), NULL },
 
-        { obj_use_scroll, "read",
+        { NULL, CMD_READ_SCROLL, "read",
       "Read which scroll? ", "You have no scrolls to read.",
           obj_is_scroll, (USE_INVEN | USE_FLOOR), obj_read_pre },
 
-        { obj_refill, "refill",
+        { NULL, CMD_REFILL, "refill",
       "Refuel with what fuel source? ", "You have nothing to refuel with.",
           obj_can_refill, (USE_INVEN | USE_FLOOR), obj_refill_pre },
@@ -594 +862 @@
 
         /* Get the item */
-        if (item >= 0)
-                o_ptr = &inventory[item];
+        o_ptr = object_from_item_idx(item);
+
+        if (item_actions[act].action != NULL)
+                item_actions[act].action(o_ptr, item);
         else
-                o_ptr = &o_list[0 - item];
-
-        item_actions[act].action(o_ptr, item);
+                cmd_insert(item_actions[act].command, item);            
 }
 
 /* Wrappers */
-void do_cmd_uninscribe(void) { do_item(ACTION_UNINSCRIBE); }
-void do_cmd_inscribe(void) { do_item(ACTION_INSCRIBE); }
+void textui_cmd_uninscribe(void) { do_item(ACTION_UNINSCRIBE); }
+void textui_cmd_inscribe(void) { do_item(ACTION_INSCRIBE); }
 void do_cmd_observe(void) { do_item(ACTION_EXAMINE); }
-void do_cmd_takeoff(void) { do_item(ACTION_TAKEOFF); }
-void do_cmd_wield(void) { do_item(ACTION_WIELD); }
-void do_cmd_drop(void) { do_item(ACTION_DROP); }
+void textui_cmd_takeoff(void) { do_item(ACTION_TAKEOFF); }
+void textui_cmd_wield(void) { do_item(ACTION_WIELD); }
+void textui_cmd_drop(void) { do_item(ACTION_DROP); }
 void do_cmd_browse(void) { do_item(ACTION_BROWSE); }
-void do_cmd_study(void) { do_item(ACTION_STUDY); }
-void do_cmd_cast(void) { do_item(ACTION_CAST); }
-void do_cmd_pray(void) { do_item(ACTION_CAST); }
-void do_cmd_use_staff(void) { do_item(ACTION_USE_STAFF); }
-void do_cmd_aim_wand(void) { do_item(ACTION_AIM_WAND); }
-void do_cmd_zap_rod(void) { do_item(ACTION_ZAP_ROD); }
-void do_cmd_activate(void) { do_item(ACTION_ACTIVATE); }
-void do_cmd_eat_food(void) { do_item(ACTION_EAT_FOOD); }
-void do_cmd_quaff_potion(void) { do_item(ACTION_QUAFF_POTION); }
-void do_cmd_read_scroll(void) { do_item(ACTION_READ_SCROLL); }
-void do_cmd_refill(void) { do_item(ACTION_REFILL); }
+void textui_cmd_study(void) { do_item(ACTION_STUDY); }
+void textui_cmd_cast(void) { do_item(ACTION_CAST); }
+void textui_cmd_pray(void) { do_item(ACTION_CAST); }
+void textui_cmd_use_staff(void) { do_item(ACTION_USE_STAFF); }
+void textui_cmd_aim_wand(void) { do_item(ACTION_AIM_WAND); }
+void textui_cmd_zap_rod(void) { do_item(ACTION_ZAP_ROD); }
+void textui_cmd_activate(void) { do_item(ACTION_ACTIVATE); }
+void textui_cmd_eat_food(void) { do_item(ACTION_EAT_FOOD); }
+void textui_cmd_quaff_potion(void) { do_item(ACTION_QUAFF_POTION); }
+void textui_cmd_read_scroll(void) { do_item(ACTION_READ_SCROLL); }
+void textui_cmd_refill(void) { do_item(ACTION_REFILL); }

trunk/src/cmd0.c

@@ -20 +20 @@
 #include "cmds.h"
 #include "ui-menu.h"
-
+#include "game-cmd.h"
 
 /*
@@ -40 +40 @@
 /* Forward declare these, because they're really defined later */
 static do_cmd_type do_cmd_wizard, do_cmd_try_debug,
-            do_cmd_quit, do_cmd_mouseclick, do_cmd_port,
+            do_cmd_mouseclick, do_cmd_port,
                         do_cmd_xxx_options, do_cmd_menu, do_cmd_monlist, do_cmd_itemlist;
 
@@ -48 +48 @@
 
 /*
- * Holds a generic command.
+ * Holds a generic command - if cmd is set to other than CMD_NULL 
+ * it simply pushes that command to the game, otherwise the hook 
+ * function will be called.
  */
 typedef struct
@@ -54 +56 @@
         const char *desc;
         unsigned char key;
+        cmd_code cmd;
         do_cmd_type *hook;
 } command_type;
 
-
 /* Magic use */
 static command_type cmd_magic[] =
 {
-        { "Gain new spells or prayers", 'G', do_cmd_study },
-        { "Browse a book",              'b', do_cmd_browse },
-        { "Cast a spell",               'm', do_cmd_cast },
-        { "Pray a prayer",              'p', do_cmd_pray }
+        { "Gain new spells or prayers", 'G', CMD_NULL, textui_cmd_study },
+        { "Browse a book",              'b', CMD_NULL, do_cmd_browse },
+        { "Cast a spell",               'm', CMD_NULL, textui_cmd_cast },
+        { "Pray a prayer",              'p', CMD_NULL, textui_cmd_pray }
 };
 
@@ -70 +72 @@
 static command_type cmd_action[] =
 {
-        { "Search for traps/doors",     's', do_cmd_search },
-        { "Disarm a trap or chest",     'D', do_cmd_disarm },
-        { "Rest for a while",           'R', do_cmd_rest },
-        { "Look around",                'l', do_cmd_look },
-        { "Target monster or location", '*', do_cmd_target },
-        { "Dig a tunnel",               'T', do_cmd_tunnel },
-        { "Go up staircase",            '<', do_cmd_go_up },
-        { "Go down staircase",          '>', do_cmd_go_down },
-        { "Toggle search mode",         'S', do_cmd_toggle_search },
-        { "Open a door or a chest",     'o', do_cmd_open },
-        { "Close a door",               'c', do_cmd_close },
-        { "Jam a door shut",            'j', do_cmd_spike },
-        { "Bash a door open",           'B', do_cmd_bash }
+        { "Search for traps/doors",     's', CMD_SEARCH, NULL },
+        { "Disarm a trap or chest",     'D', CMD_NULL, textui_cmd_disarm },
+        { "Rest for a while",           'R', CMD_NULL, textui_cmd_rest },
+        { "Look around",                'l', CMD_NULL, do_cmd_look },
+        { "Target monster or location", '*', CMD_NULL, do_cmd_target },
+        { "Dig a tunnel",               'T', CMD_NULL, textui_cmd_tunnel },
+        { "Go up staircase",            '<', CMD_GO_UP, NULL },
+        { "Go down staircase",          '>', CMD_GO_DOWN, NULL },
+        { "Toggle search mode",         'S', CMD_TOGGLE_SEARCH, NULL },
+        { "Open a door or a chest",     'o', CMD_NULL, textui_cmd_open },
+        { "Close a door",               'c', CMD_NULL, textui_cmd_close },
+        { "Jam a door shut",            'j', CMD_NULL, textui_cmd_spike },
+        { "Bash a door open",           'B', CMD_NULL, textui_cmd_bash }
 };
 
@@ -88 +90 @@
 static command_type cmd_item_use[] =
 {
-        { "Read a scroll",            'r', do_cmd_read_scroll },
-        { "Quaff a potion",           'q', do_cmd_quaff_potion },
-        { "Use a staff",              'u', do_cmd_use_staff },
-        { "Aim a wand",               'a', do_cmd_aim_wand },
-        { "Zap a rod",                'z', do_cmd_zap_rod },
-        { "Activate an object",       'A', do_cmd_activate },
-        { "Eat some food",            'E', do_cmd_eat_food },
-        { "Fuel your light source",   'F', do_cmd_refill },
-        { "Fire your missile weapon", 'f', do_cmd_fire },
-        { "Throw an item",            'v', do_cmd_throw }
+        { "Read a scroll",            'r', CMD_NULL, textui_cmd_read_scroll },
+        { "Quaff a potion",           'q', CMD_NULL, textui_cmd_quaff_potion },
+        { "Use a staff",              'u', CMD_NULL, textui_cmd_use_staff },
+        { "Aim a wand",               'a', CMD_NULL, textui_cmd_aim_wand },
+        { "Zap a rod",                'z', CMD_NULL, textui_cmd_zap_rod },
+        { "Activate an object",       'A', CMD_NULL, textui_cmd_activate },
+        { "Eat some food",            'E', CMD_NULL, textui_cmd_eat_food },
+        { "Fuel your light source",   'F', CMD_NULL, textui_cmd_refill },
+        { "Fire your missile weapon", 'f', CMD_NULL, textui_cmd_fire },
+        { "Throw an item",            'v', CMD_NULL, textui_cmd_throw }
 };
 
 /* Item management commands */
-static command_type cmd_item_manage[]  =
-{
-        { "Display equipment listing", 'e', do_cmd_equip },
-        { "Display inventory listing", 'i', do_cmd_inven },
-        { "Pick up objects",           'g', do_cmd_pickup },
-        { "Wear/wield an item",        'w', do_cmd_wield },
-        { "Take/unwield off an item",  't', do_cmd_takeoff },
-        { "Drop an item",              'd', do_cmd_drop },
-        { "Destroy an item",           'k', do_cmd_destroy },
-        { "Examine an item",           'I', do_cmd_observe },
-        { "Inscribe an object",        '{', do_cmd_inscribe },
-        { "Uninscribe an object",      '}', do_cmd_uninscribe }
+static command_type cmd_item_manage[] =
+{
+        { "Display equipment listing", 'e', CMD_NULL, do_cmd_equip },
+        { "Display inventory listing", 'i', CMD_NULL, do_cmd_inven },
+        { "Pick up objects",           'g', CMD_PICKUP, NULL },
+        { "Wear/wield an item",        'w', CMD_NULL, textui_cmd_wield },
+        { "Take/unwield off an item",  't', CMD_NULL, textui_cmd_takeoff },
+        { "Drop an item",              'd', CMD_NULL, textui_cmd_drop },
+        { "Destroy an item",           'k', CMD_NULL, textui_cmd_destroy },
+        { "Examine an item",           'I', CMD_NULL, do_cmd_observe },
+        { "Inscribe an object",        '{', CMD_NULL, textui_cmd_inscribe },
+        { "Uninscribe an object",      '}', CMD_NULL, textui_cmd_uninscribe }
 };
 
@@ -118 +120 @@
 static command_type cmd_info[] =
 {
-        { "Full dungeon map",             'M', do_cmd_view_map },
-        { "Display visible item list",    ']', do_cmd_itemlist },
-        { "Display visible monster list", '[', do_cmd_monlist },
-        { "Locate player on map",         'L', do_cmd_locate },
-        { "Help",                         '?', do_cmd_help },
-        { "Identify symbol",              '/', do_cmd_query_symbol },
-        { "Character description",        'C', do_cmd_change_name },
-        { "Check knowledge",              '~', do_cmd_knowledge },
-        { "Repeat level feeling",   KTRL('F'), do_cmd_feeling },
-        { "Show previous message",  KTRL('O'), do_cmd_message_one },
-        { "Show previous messages", KTRL('P'), do_cmd_messages }
+        { "Full dungeon map",             'M', CMD_NULL, do_cmd_view_map },
+        { "Display visible item list",    ']', CMD_NULL, do_cmd_itemlist },
+        { "Display visible monster list", '[', CMD_NULL, do_cmd_monlist },
+        { "Locate player on map",         'L', CMD_NULL, do_cmd_locate },
+        { "Help",                         '?', CMD_NULL, do_cmd_help },
+        { "Identify symbol",              '/', CMD_NULL, do_cmd_query_symbol },
+        { "Character description",        'C', CMD_NULL, do_cmd_change_name },
+        { "Check knowledge",              '~', CMD_NULL, do_cmd_knowledge },
+        { "Repeat level feeling",   KTRL('F'), CMD_NULL, do_cmd_feeling },
+        { "Show previous message",  KTRL('O'), CMD_NULL, do_cmd_message_one },
+        { "Show previous messages", KTRL('P'), CMD_NULL, do_cmd_messages }
 };
 
@@ -134 +136 @@
 static command_type cmd_util[] =
 {
-        { "Interact with options",        '=', do_cmd_xxx_options },
-        { "Port-specific preferences",    '!', do_cmd_port },
-
-        { "Save and don't quit",  KTRL('S'), do_cmd_save_game },
-        { "Save and quit",        KTRL('X'), do_cmd_quit },
-        { "Quit (commit suicide)",      'Q', do_cmd_suicide },
-        { "Redraw the screen",    KTRL('R'), do_cmd_redraw },
-
-        { "Load \"screen dump\"",       '(', do_cmd_load_screen },
-        { "Save \"screen dump\"",       ')', do_cmd_save_screen }
+        { "Interact with options",        '=', CMD_NULL, do_cmd_xxx_options },
+        { "Port-specific preferences",    '!', CMD_NULL, do_cmd_port },
+
+        { "Save and don't quit",  KTRL('S'), CMD_SAVE, NULL },
+        { "Save and quit",        KTRL('X'), CMD_QUIT, NULL },
+        { "Quit (commit suicide)",      'Q', CMD_NULL, textui_cmd_suicide },
+        { "Redraw the screen",    KTRL('R'), CMD_NULL, do_cmd_redraw },
+
+        { "Load \"screen dump\"",       '(', CMD_NULL, do_cmd_load_screen },
+        { "Save \"screen dump\"",       ')', CMD_NULL, do_cmd_save_screen }
 };
 
@@ -149 +151 @@
 static command_type cmd_hidden[] =
 {
-        { "Take notes",               ':', do_cmd_note },
-        { "Version info",             'V', do_cmd_version },
-        { "Load a single pref line",  '"', do_cmd_pref },
-        { "Mouse click",           '\xff', do_cmd_mouseclick },
-        { "Enter a store",            '_', do_cmd_store },
-        { "Toggle windows",     KTRL('E'), toggle_inven_equip }, /* XXX */
-        { "Alter a grid",             '+', do_cmd_alter },
-        { "Walk",                     ';', do_cmd_walk },
-        { "Jump into a trap",         '-', do_cmd_jump },
-        { "Start running",            '.', do_cmd_run },
-        { "Stand still",              ',', do_cmd_hold },
-        { "Check knowledge",          '|', do_cmd_knowledge },
-        { "Display menu of actions", '\n', do_cmd_menu },
-        { "Display menu of actions", '\r', do_cmd_menu },
-
-        { "Toggle wizard mode",  KTRL('W'), do_cmd_wizard },
+        { "Take notes",               ':', CMD_NULL, do_cmd_note },
+        { "Version info",             'V', CMD_NULL, do_cmd_version },
+        { "Load a single pref line",  '"', CMD_NULL, do_cmd_pref },
+        { "Mouse click",           '\xff', CMD_NULL, do_cmd_mouseclick },
+        { "Enter a store",            '_', CMD_ENTER_STORE, NULL },
+        { "Toggle windows",     KTRL('E'), CMD_NULL, toggle_inven_equip }, /* XXX */
+        { "Alter a grid",             '+', CMD_NULL, textui_cmd_alter },
+        { "Walk",                     ';', CMD_NULL, textui_cmd_walk },
+        { "Jump into a trap",         '-', CMD_NULL, textui_cmd_jump },
+        { "Start running",            '.', CMD_NULL, textui_cmd_run },
+        { "Stand still",              ',', CMD_HOLD, NULL },
+        { "Check knowledge",          '|', CMD_NULL, do_cmd_knowledge },
+        { "Display menu of actions", '\n', CMD_NULL, do_cmd_menu },
+        { "Display menu of actions", '\r', CMD_NULL, do_cmd_menu },
+
+        { "Toggle wizard mode",  KTRL('W'), CMD_NULL, do_cmd_wizard },
 
 #ifdef ALLOW_DEBUG
-        { "Debug mode commands", KTRL('A'), do_cmd_try_debug },
+        { "Debug mode commands", KTRL('A'), CMD_NULL, do_cmd_try_debug },
 #endif
 #ifdef ALLOW_BORG
-        { "Borg commands",       KTRL('Z'), do_cmd_try_borg }
+        { "Borg commands",       KTRL('Z'), CMD_NULL, do_cmd_try_borg }
 #endif
 };
@@ -308 +310 @@
  * Quit the game.
  */
-static void do_cmd_quit(void)
+void do_cmd_quit(cmd_code code, cmd_arg args[])
 {
         /* Stop playing */
@@ -336 +338 @@
         if ((p_ptr->py == y) && (p_ptr->px == x) /* && (p_ptr->command_cmd_ex.mousebutton) */)
         {
-                do_cmd_rest();
+                textui_cmd_rest();
         }
         else /* if (p_ptr->command_cmd_ex.mousebutton == 1) */
@@ -342 +344 @@
                 if (p_ptr->timed[TMD_CONFUSED])
                 {
-                        do_cmd_walk();
+                        cmd_insert(CMD_WALK, DIR_UNKNOWN);
                 }
                 else
                 {
-                        do_cmd_pathfind(y, x);
+                        cmd_insert(CMD_PATHFIND, y, x);
                 }
         }
@@ -426 +428 @@
 
 /* List indexed by char */
-do_cmd_type *converted_list[UCHAR_MAX+1];
+struct {
+        do_cmd_type *hook;
+        cmd_code cmd;
+} converted_list[UCHAR_MAX+1];
 
 
@@ -552 +557 @@
         ui_event_data evt;
         int cursor = 0;
-        command_type chosen_command = { NULL, 0, NULL };
+        command_type chosen_command = { NULL };
 
         /* Set up the menu */
@@ -572 +577 @@
 
         /* If a command was chosen, do it. */
-        if (chosen_command.hook)
+        if (chosen_command.cmd != CMD_NULL)
+        {
+                cmd_insert(chosen_command.cmd);
+        }
+        else if (chosen_command.hook)
         {
                 chosen_command.hook();
@@ -600 +609 @@
                         /* Note: at present converted_list is UCHAR_MAX + 1 
                            large, so 'key' is always a valid index. */
-                        converted_list[key] = commands[i].hook;
+                        converted_list[key].hook = commands[i].hook;
+                        converted_list[key].cmd = commands[i].cmd;
                 }
         }
@@ -619 +629 @@
                         default:
                         {
-                                if (!converted_list[i])
-                                        converted_list[i] = do_cmd_unknown;
+                                if (!converted_list[i].hook && !converted_list[i].cmd)
+                                {
+                                        converted_list[i].hook = do_cmd_unknown;
+                                        converted_list[i].cmd = CMD_NULL;
+                                }
                         }
                 }               
@@ -631 +644 @@
  * Give "Warning" on illegal commands.
  */
-void process_command(bool no_request)
+void textui_process_command(bool no_request)
 {
         if (!no_request)
@@ -648 +661 @@
                 /* Within these boundaries, the cast to unsigned char will have the desired effect */
                 assert(p_ptr->command_cmd >= CHAR_MIN && p_ptr->command_cmd <= CHAR_MAX);
-
                 /* Execute the command */
-                if (converted_list[(unsigned char) p_ptr->command_cmd])
-                        converted_list[(unsigned char) p_ptr->command_cmd]();
-        }
-}
+                if (converted_list[(unsigned char) p_ptr->command_cmd].cmd != CMD_NULL)
+                        cmd_insert(converted_list[(unsigned char) p_ptr->command_cmd].cmd);
+
+                else if (converted_list[(unsigned char) p_ptr->command_cmd].hook)
+                        converted_list[(unsigned char) p_ptr->command_cmd].hook();
+        }
+}

trunk/src/cmd1.c

@@ -573 +573 @@
                 }
 
-                do_cmd_alter();
+                do_cmd_alter_aux(dir);
         }
 
@@ -673 +673 @@
                         /* Disturb */
                         disturb(0, 0);
-
-                        /* Hack -- Enter store */
-                        p_ptr->command_new = '_';
+                        cmd_insert(CMD_ENTER_STORE);
                 }
 

trunk/src/cmd2.c

@@ -20 +20 @@
 
 #include "cmds.h"
+#include "game-cmd.h"
 
 /*
  * Go up one level
  */
-void do_cmd_go_up(void)
+void do_cmd_go_up(cmd_code code, cmd_arg args[])
 {
         /* Verify stairs */
@@ -58 +59 @@
  * Go down one level
  */
-void do_cmd_go_down(void)
+void do_cmd_go_down(cmd_code code, cmd_arg args[])
 {
         /* Verify stairs */
@@ -86 +87 @@
  * Simple command to "search" for one turn
  */
-void do_cmd_search(void)
+void do_cmd_search(cmd_code code, cmd_arg args[])
 {
         /* Allow repeated command */
@@ -102 +103 @@
  * Hack -- toggle search mode
  */
-void do_cmd_toggle_search(void)
+void do_cmd_toggle_search(cmd_code code, cmd_arg args[])
 {
         /* Stop searching */
@@ -730 +731 @@
  * Unlocking a locked door/chest is worth one experience point.
  */
-void do_cmd_open(void)
+void do_cmd_open(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
@@ -738 +739 @@
         bool more = FALSE;
 
-
-        /* Easy Open */
-        if (OPT(easy_open))
-        {
-                int num_doors, num_chests;
-
-                /* Count closed doors */
-                num_doors = count_feats(&y, &x, is_closed, FALSE);
-
-                /* Count chests (locked) */
-                num_chests = count_chests(&y, &x, FALSE);
-
-                /* See if only one target */
-                if ((num_doors + num_chests) == 1)
-                {
-                        p_ptr->command_dir = coords_to_dir(y, x);
-                }
-        }
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -818 +799 @@
 }
 
+void textui_cmd_open(void)
+{
+        int y, x, dir = DIR_UNKNOWN;
+
+        /* Easy Open */
+        if (OPT(easy_open))
+        {
+                int num_doors, num_chests;
+
+                /* Count closed doors */
+                num_doors = count_feats(&y, &x, is_closed, FALSE);
+
+                /* Count chests (locked) */
+                num_chests = count_chests(&y, &x, FALSE);
+
+                /* See if only one target */
+                if ((num_doors + num_chests) == 1)
+                {
+                        dir = coords_to_dir(y, x);
+                }
+        }
+
+        cmd_insert(CMD_OPEN, dir);
+}
+
 
 /*
@@ -861 +867 @@
         bool more = FALSE;
 
-
         /* Verify legality */
         if (!do_cmd_close_test(y, x)) return (FALSE);
 
-
         /* Broken door */
         if (cave_feat[y][x] == FEAT_BROKEN)
@@ -894 +898 @@
  * Close an open door.
  */
-void do_cmd_close(void)
+void do_cmd_close(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
@@ -900 +904 @@
         bool more = FALSE;
 
-
-        /* Easy Close */
-        if (OPT(easy_open))
-        {
-                /* Count open doors */
-                if (count_feats(&y, &x, is_open, FALSE) == 1)
-                {
-                        p_ptr->command_dir = coords_to_dir(y, x);
-                }
-        }
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -918 +910 @@
         x = p_ptr->px + ddx[dir];
 
-
         /* Verify legality */
         if (!do_cmd_close_test(y, x)) return;
-
 
         /* Take a turn */
@@ -959 +949 @@
 }
 
+void textui_cmd_close(void)
+{
+        int y, x, dir = DIR_UNKNOWN;
+
+        /* Easy Close */
+        if (OPT(easy_open))
+        {
+                /* Count open doors */
+                if (count_feats(&y, &x, is_open, FALSE) == 1)
+                {
+                        dir = coords_to_dir(y, x);
+                }
+        }
+
+        cmd_insert(CMD_CLOSE, dir);
+}
 
 
@@ -1222 +1228 @@
  * accomplished by strong players using heavy weapons.
  */
-void do_cmd_tunnel(void)
+void do_cmd_tunnel(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
-
         bool more = FALSE;
 
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -1277 +1280 @@
 }
 
+void textui_cmd_tunnel(void)
+{
+        cmd_insert(CMD_TUNNEL, DIR_UNKNOWN);
+}
+
 
 /*
@@ -1397 +1405 @@
  * Disarms a trap, or a chest
  */
-void do_cmd_disarm(void)
+void do_cmd_disarm(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
@@ -1405 +1413 @@
         bool more = FALSE;
 
-
-        /* Easy Disarm */
-        if (OPT(easy_open))
-        {
-                int num_traps, num_chests;
-
-                /* Count visible traps */
-                num_traps = count_feats(&y, &x, is_trap, TRUE);
-
-                /* Count chests (trapped) */
-                num_chests = count_chests(&y, &x, TRUE);
-
-                /* See if only one target */
-                if (num_traps || num_chests)
-                {
-                        if (num_traps + num_chests <= 1)
-                                p_ptr->command_dir = coords_to_dir(y, x);
-                }
-        }
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -1486 +1473 @@
 }
 
+void textui_cmd_disarm(void)
+{
+        int y, x, dir;
+
+        dir = DIR_UNKNOWN;
+
+        /* Easy Disarm */
+        if (OPT(easy_open))
+        {
+                int num_traps, num_chests;
+
+                /* Count visible traps */
+                num_traps = count_feats(&y, &x, is_trap, TRUE);
+
+                /* Count chests (trapped) */
+                num_chests = count_chests(&y, &x, TRUE);
+
+                /* See if only one target */
+                if (num_traps || num_chests)
+                {
+                        if (num_traps + num_chests <= 1)
+                                dir = coords_to_dir(y, x);
+                }
+        }
+
+        cmd_insert(CMD_DISARM, dir);
+}
 
 /*
@@ -1614 +1628 @@
  * Creatures can also open or bash doors, see elsewhere.
  */
-void do_cmd_bash(void)
+void do_cmd_bash(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
 
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -1668 +1680 @@
 }
 
+void textui_cmd_bash(void)
+{
+        cmd_insert(CMD_BASH, DIR_UNKNOWN);
+}
+
 
 
@@ -1681 +1698 @@
  * is confused, and it must be verified against the new grid.
  */
-void do_cmd_alter(void)
-{
-        int y, x, dir;
+void do_cmd_alter_aux(int dir)
+{
+        int y, x;
 
         int feat;
 
         bool more = FALSE;
-
-
-        /* Get a direction */
-        if (!get_rep_dir(&dir)) return;
 
         /* Get location */
@@ -1777 +1790 @@
 }
 
+void do_cmd_alter(cmd_code code, cmd_arg args[])
+{
+        do_cmd_alter_aux(args[0].direction);
+}
+
+void textui_cmd_alter(void)
+{
+        cmd_insert(CMD_ALTER, DIR_UNKNOWN);
+}
 
 /*
@@ -1847 +1869 @@
  * This command may NOT be repeated
  */
-void do_cmd_spike(void)
+void do_cmd_spike(cmd_code code, cmd_arg args[])
 {
         int y, x, dir, item = 0;
 
+        dir = args[0].direction;
 
         /* Get a spike */
@@ -1861 +1884 @@
                 return;
         }
-
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
 
         /* Get location */
@@ -1925 +1944 @@
 }
 
+void textui_cmd_spike(void)
+{
+        cmd_insert(CMD_JAM, DIR_UNKNOWN);
+}
 
 
@@ -1996 +2019 @@
 
 /*
- * Helper function for the "walk" command.
- */
-static void walk(void)
+ * Walk in the given direction.
+ */
+void do_cmd_walk(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
 
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
+        dir = args[0].direction;
 
         /* Get location */
@@ -2038 +2060 @@
 
 /*
- * Walk.
- */
-void do_cmd_walk(void)
-{
-        walk();
-}
+ * Tell the game we want to walk - in future we might want to supply
+ * directions here rather than rely on keymap/macro things.
+ */
+void textui_cmd_walk(void)
+{
+        cmd_insert(CMD_WALK, DIR_UNKNOWN);
+}
+
 
 /*
@@ -2050 +2074 @@
  * What a horrible concept.
  */
-void do_cmd_jump(void)
+void do_cmd_jump(cmd_code code, cmd_arg args[])
 {
         bool old_easy_alter;
@@ -2058 +2082 @@
         OPT(easy_alter) = FALSE;
 
-        walk();
+        do_cmd_walk(code, args);
 
         /* Restore OPT(easy_alter) */
@@ -2064 +2088 @@
 }
 
+void textui_cmd_jump(void)
+{
+        cmd_insert(CMD_JUMP, DIR_UNKNOWN);
+}
 
 
@@ -2071 +2099 @@
  * Note that running while confused is not allowed.
  */
-void do_cmd_run(void)
+void do_cmd_run(cmd_code code, cmd_arg args[])
 {
         int y, x, dir;
 
+        dir = args[0].direction;
 
         /* Hack XXX XXX XXX */
@@ -2082 +2111 @@
                 return;
         }
-
-
-        /* Get a direction (or abort) */
-        if (!get_rep_dir(&dir)) return;
 
         /* Get location */
@@ -2100 +2125 @@
 }
 
+void textui_cmd_run(void)
+{
+        cmd_insert(CMD_RUN, DIR_UNKNOWN);
+}
+
 /*
  * Start running with pathfinder.
@@ -2105 +2135 @@
  * Note that running while confused is not allowed.
  */
-void do_cmd_pathfind(int y, int x)
+void do_cmd_pathfind(cmd_code code, cmd_arg args[])
 {
         /* Hack XXX XXX XXX */
@@ -2114 +2144 @@
         }
 
-        if (findpath(y, x))
+        if (findpath(args[0].point.y, args[0].point.x))
         {
                 p_ptr->running = 1000;
@@ -2130 +2160 @@
  * Pick up treasure if "pickup" is true.
  */
-void do_cmd_hold(void)
+void do_cmd_hold(cmd_code code, cmd_arg args[])
 {
         /* Allow repeated command */
@@ -2161 +2191 @@
                 disturb(0, 0);
 
-                /* Hack -- enter store */
-                p_ptr->command_new = '_';
+                cmd_insert(CMD_ENTER_STORE);
 
                 /* Free turn XXX XXX XXX */
@@ -2174 +2203 @@
  * Pick up objects on the floor beneath you.  -LM-
  */
-void do_cmd_pickup(void)
+void do_cmd_pickup(cmd_code code, cmd_arg args[])
 {
         int energy_cost;
@@ -2193 +2222 @@
  * Rest (restores hit points and mana and such)
  */
-void do_cmd_rest(void)
-{
-        /* Prompt for time if needed */
+void do_cmd_rest(cmd_code code, cmd_arg args[])
+{
+        /* Save the rest code */
+        switch (args[0].choice)
+        {
+                case REST_ALL:
+                {
+                        p_ptr->resting = -2;
+                        break;
+                }
+
+                case REST_ALL_POINTS:
+                {
+                        p_ptr->resting = -1;
+                        break;
+                }
+
+                case REST_SOME_POINTS:
+                {
+                        p_ptr->resting = -3;
+                        break;
+                }
+
+                default:
+                {
+                        p_ptr->resting = p_ptr->command_arg;
+                }
+        }
+
+        /* Take a turn XXX XXX XXX (?) */
+        p_ptr->energy_use = 100;
+
+        /* Cancel the arg */
+        p_ptr->command_arg = 0;
+
+        /* Cancel searching */
+        p_ptr->searching = FALSE;
+
+        /* Recalculate bonuses */
+        p_ptr->update |= (PU_BONUS);
+
+        /* Redraw the state */
+        p_ptr->redraw |= (PR_STATE);
+
+        /* Handle stuff */
+        handle_stuff();
+
+        /* Refresh XXX XXX XXX */
+        Term_fresh();
+}
+
+
+void textui_cmd_rest(void)
+{
+        /* Prompt for time if needed */
         if (p_ptr->command_arg <= 0)
         {
@@ -2208 +2289 @@
                 if (out_val[0] == '&')
                 {
-                        p_ptr->command_arg = (-2);
+                        cmd_insert(CMD_REST, REST_ALL);
                 }
 
@@ -2214 +2295 @@
                 else if (out_val[0] == '*')
                 {
-                        p_ptr->command_arg = (-1);
+                        cmd_insert(CMD_REST, REST_ALL_POINTS);
                 }
 
@@ -2220 +2301 @@
                 else if (out_val[0] == '!')
                 {
-                        p_ptr->command_arg = (-3);
+                        cmd_insert(CMD_REST, REST_SOME_POINTS);
                 }
                 
@@ -2228 +2309 @@
                         p_ptr->command_arg = atoi(out_val);
                         if (p_ptr->command_arg <= 0) return;
-                }
-        }
-
-
-        /* Paranoia */
-        if (p_ptr->command_arg > 9999) p_ptr->command_arg = 9999;
-
-
-        /* Take a turn XXX XXX XXX (?) */
-        p_ptr->energy_use = 100;
-
-        /* Save the rest code */
-        p_ptr->resting = p_ptr->command_arg;
-
-        /* Cancel the arg */
-        p_ptr->command_arg = 0;
-
-        /* Cancel searching */
-        p_ptr->searching = FALSE;
-
-        /* Recalculate bonuses */
-        p_ptr->update |= (PU_BONUS);
-
-        /* Redraw the state */
-        p_ptr->redraw |= (PR_STATE);
-
-        /* Handle stuff */
-        handle_stuff();
-
-        /* Refresh XXX XXX XXX */
-        Term_fresh();
-}
+                        if (p_ptr->command_arg > 9999) p_ptr->command_arg = 9999;
+                        
+                        cmd_insert(CMD_REST, REST_TURNS);
+                }
+        }
+}
+
+
+/*
+ * Hack -- commit suicide
+ */
+void do_cmd_suicide(cmd_code code, cmd_arg args[])
+{
+        /* Commit suicide */
+        p_ptr->is_dead = TRUE;
+
+        /* Stop playing */
+        p_ptr->playing = FALSE;
+
+        /* Leaving */
+        p_ptr->leaving = TRUE;
+
+        /* Cause of death */
+        my_strcpy(p_ptr->died_from, "Quitting", sizeof(p_ptr->died_from));
+}
+
+
+void textui_cmd_suicide(void)
+{
+        /* Flush input */
+        flush();
+
+        /* Verify Retirement */
+        if (p_ptr->total_winner)
+        {
+                /* Verify */
+                if (!get_check("Do you want to retire? ")) return;
+        }
+
+        /* Verify Suicide */
+        else
+        {
+                char ch;
+
+                /* Verify */
+                if (!get_check("Do you really want to commit suicide? ")) return;
+
+                /* Special Verification for suicide */
+                prt("Please verify SUICIDE by typing the '@' sign: ", 0, 0);
+                flush();
+                ch = inkey();
+                prt("", 0, 0);
+                if (ch != '@') return;
+        }
+
+        cmd_insert(CMD_SUICIDE);
+}
+
+void do_cmd_save_game(cmd_code code, cmd_arg args[])
+{
+        save_game();
+}
+

trunk/src/cmd3.c

@@ -198 +198 @@
  * Destroy an item
  */
-void do_cmd_destroy(void)
+void do_cmd_destroy(cmd_code code, cmd_arg args[])
+{
+        int item, amt;
+
+        object_type *o_ptr;
+
+        object_type *i_ptr;
+        object_type object_type_body;
+
+        char o_name[120];
+
+        item = args[0].item;
+        amt = args[1].number;
+
+        /* Destroying squelched items is easy. */
+        if (item == ALL_SQUELCHED)
+        {