Changeset 505

Timestamp:

08/12/07 05:41:12 (1 year ago)

Author:

takkaria

Message:

Finally remove script.h, and move the x-spell defines to externs.h.
Remove some space at the end of the line from x-spell.c
Add the new-style file header to store.c.

Files:

• trunk/src/Makefile.inc (modified) (11 diffs)
• trunk/src/birth.c (modified) (1 diff)
• trunk/src/cmd5.c (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/init2.c (modified) (1 diff)
• trunk/src/script.h (deleted)
• trunk/src/spells1.c (modified) (1 diff)
• trunk/src/store.c (modified) (1 diff)
• trunk/src/wizard2.c (modified) (1 diff)
• trunk/src/x-spell.c (modified) (1 diff)
• trunk/src/xtra1.c (modified) (1 diff)
• trunk/src/z-smap.h (modified) (2 diffs)

trunk/src/Makefile.inc

@@ -19 +19 @@
-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 z-quark.h z-msg.h config.h defines.h option.h types.h \
- script.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 z-quark.h z-msg.h config.h defines.h option.h types.h \
@@ -40 +40 @@
-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 z-quark.h z-msg.h config.h defines.h option.h types.h \
- script.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 z-quark.h z-msg.h config.h defines.h option.h types.h \
@@ -46 +46 @@
-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 z-quark.h z-msg.h config.h defines.h \
- script.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 z-quark.h z-msg.h config.h defines.h \
@@ -61 +61 @@
-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 z-quark.h z-msg.h config.h defines.h option.h types.h \
-script.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 z-quark.h z-msg.h config.h defines.h option.h types.h \
@@ -68 +68 @@
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h z-blockfile.h z-smap.h
-log.o: log.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h option.h types.h \
-  ui.h z-type.h externs.h log.h
-maid-x11.o: maid-x11.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main.o: main.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h option.h types.h \
-  ui.h z-type.h externs.h main.h
-main-crb.o: main-crb.c
-main-gcu.o: main-gcu.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main-gtk.o: main-gtk.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main-ros.o: main-ros.c
-main-sdl.o: main-sdl.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h cmds.h
-main-win.o: main-win.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main-x11.o: main-x11.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main-xaw.o: main-xaw.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-main-xxx.o: main-xxx.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-melee1.o: 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 z-quark.h z-msg.h config.h defines.h \
@@ -124 +92 @@
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.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 z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-randart.o: 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 z-quark.h z-msg.h config.h defines.h \
@@ -133 +98 @@
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h randname.h
-save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt
-rand.h z-term.h z-quark.h z-msg.h config.h defines.h option.h typ
-
+pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util
+virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defin
+option.h types.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 z-quark.h z-msg.h config.h defines.h option.h types.h \
@@ -142 +107 @@
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h
-
+
+
+
+
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.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 z-quark.h z-msg.h config.h defines.h \
-  option.h types.h ui.h z-type.h externs.h script.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 z-quark.h z-msg.h config.h defines.h \
@@ -156 +121 @@
-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 z-quark.h z-msg.h config.h defines.h option.h types.h \
-script.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 z-quark.h z-msg.h config.h defines.h \
@@ -177 +142 @@
-wizard2.o: wizard2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h \
- script.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 z-quark.h z-msg.h config.h defines.h \
- script.h
+
-xtra1.o: xtra1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h z-quark.h z-msg.h config.h defines.h option.h types.h \
- script.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 z-quark.h z-msg.h config.h defines.h option.h types.h \
-  ui.h z-type.h externs.h cmds.h
-z-blockfile.o: z-blockfile.c z-virt.h h-basic.h z-blockfile.h z-file.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
@@ -193 +157 @@
-z-quark.o: z-quark.c z-virt.h h-basic.h z-quark.h
-z-rand.o: z-rand.c z-rand.h h-basic.h
-z-smap.o: z-smap.c z-virt.h h-basic.h z-file.h z-smap.h
-z-term.o: z-term.c z-term.h h-basic.h z-virt.h
-z-type.o: z-type.c h-basic.h z-form.h z-term.h ui.h z-type.h
-z-util.o: z-util.c z-util.h h-basic.h
-z-virt.o: z-virt.c z-virt.h h-basic.h z-util.h
+z-blockfile.o: z-blockfile.c z-virt.h h-basic.h z-blockfile.h z-file.h
+z-smap.o: z-smap.c z-virt.h h-basic.h z-file.h z-smap.h

trunk/src/birth.c

@@ -11 +11 @@
-#include "angband.h"
-#include "cmds.h"
-#include "script.h"
-
-

trunk/src/cmd5.c

@@ -10 +10 @@
-
-#include "angband.h"
-
-#include "script.h"
-
-

trunk/src/dungeon.c

@@ -12 +12 @@
-#include "z-file.h"
-#include "cmds.h"
-#include "script.h"
-
-

trunk/src/externs.h

@@ -685 +685 @@
-extern void repeat_check(void);
-
+/* x-spell.c */
+extern int get_spell_index(const object_type *o_ptr, int index);
+extern cptr get_spell_name(int tval, int index);
+extern void get_spell_info(int tval, int index, char *buf, size_t len);
+extern bool cast_spell(int tval, int index);
+
-/* xtra1.c */
-extern void cnv_stat(int val, char *out_val, size_t len);

trunk/src/init2.c

@@ -13 +13 @@
-
-#include "init.h"
-#include "script.h"
-#include "cmds.h"
-#include "option.h"

trunk/src/spells1.c

@@ -11 +11 @@
-#include "angband.h"
-
-#include "script.h"
-
-

trunk/src/store.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#include "angband.h"
-#include "script.h"
-#include "cmds.h"
+
-
-/*** Constants and definitions ***/

trunk/src/wizard2.c

@@ -8 +8 @@
- * are included in all such copies.  Other copyrights may also apply.
- */
-
-#include "angband.h"
-#include "cmds.h"
-#include "script.h"
-
-

trunk/src/x-spell.c

@@ -11 +11 @@
-
-#include "angband.h"
-#include "script.h"
-
-

trunk/src/xtra1.c

@@ -10 +10 @@
-
-#include "angband.h"
-#include "script.h"
-
-

trunk/src/z-smap.h

@@ -4 +4 @@
-#include "h-basic.h"
-
-
+
+
-        byte type;
-        u32b keylen;
-        u32b datalen;
-        char *key;
-
+
+
-                bool boolval;
-                char charval;
@@ -24 +26 @@
-} sentry_t;
-
-
+
+
-        sentry_t *entries;
-} smap_t;