[CF-Devel] CVS update: crossfire/include
Crossfire CVS devel
mwedel at scruznet.com
Mon Oct 16 14:26:38 CDT 2000
Date: Monday October 16, 2000 @ 12:26
Author: peterm
Update of /home/cvs/CVS/crossfire/include
In directory boltzmann.eecs.berkeley.edu:/tmp/cvs-serv24713
Modified Files:
config.h define.h spellist.h sproto.h
Log Message:
define.h: defines added for playerchangers and class types
base 10 numbers added for the spell paths.
spellist.h: fixed up summoning spells a little
sproto.h: new prototypes
config.h: hate RECYCLE_TMP_MAPS, turned it off
--PeterM
****************************************
Index: crossfire/include/config.h
diff -u crossfire/include/config.h:1.7 crossfire/include/config.h:1.8
--- crossfire/include/config.h:1.7 Tue Aug 1 23:04:49 2000
+++ crossfire/include/config.h Mon Oct 16 12:26:38 2000
@@ -1,6 +1,6 @@
/*
* static char *rcsid_config_h =
- * "$Id: config.h,v 1.7 2000/08/02 06:04:49 cvs Exp $";
+ * "$Id: config.h,v 1.8 2000/10/16 19:26:38 peterm Exp $";
*/
/*
@@ -355,9 +355,9 @@
* this to really work, the filename must be constant so the next run
* knows where to find the information.
*/
-
+/*
#define RECYCLE_TMP_MAPS
-
+*/
/* define RESURECTION if you want to let players bring other players
* back to life via some spells. If RESURRECTION is undefined, then a
Index: crossfire/include/define.h
diff -u crossfire/include/define.h:1.13 crossfire/include/define.h:1.14
--- crossfire/include/define.h:1.13 Tue Sep 26 17:50:18 2000
+++ crossfire/include/define.h Mon Oct 16 12:26:38 2000
@@ -1,6 +1,6 @@
/*
* static char *rcsid_define_h =
- * "$Id: define.h,v 1.13 2000/09/27 00:50:18 peterm Exp $";
+ * "$Id: define.h,v 1.14 2000/10/16 19:26:38 peterm Exp $";
*/
/*
@@ -122,9 +122,9 @@
#define HORN 35
#define MONEY 36
-/* unused: 37
- * type 37 was GRAVE
- */
+#define CLASS 37 /* object for applying character class modifications to someone */
+
+
#define GRAVESTONE 38
#define AMULET 39
@@ -154,6 +154,7 @@
#define MARKER 55 /* inserts an invisible, weightless
force into a player with a specified string. */
#define HOLY_ALTAR 56
+#define PLAYER_CHANGER 57
#define GEM 60
#define FIRECHEST 61
@@ -280,27 +281,27 @@
#define AT_BLIND 0x00400000 /* 4194304
thomas at astro.psu.edu
*/
#define AT_INTERNAL 0x00800000 /* Only used for internal calculations */
-#define PATH_NULL 0x00000000
-#define PATH_PROT 0x00000001
-#define PATH_FIRE 0x00000002
-#define PATH_FROST 0x00000004
-#define PATH_ELEC 0x00000008
-#define PATH_MISSILE 0x00000010
-#define PATH_SELF 0x00000020
-#define PATH_SUMMON 0x00000040
-#define PATH_ABJURE 0x00000080
-#define PATH_RESTORE 0x00000100
-#define PATH_DETONATE 0x00000200
-#define PATH_MIND 0x00000400
-#define PATH_CREATE 0x00000800
-#define PATH_TELE 0x00001000
-#define PATH_INFO 0x00002000
-#define PATH_TRANSMUTE 0x00004000
-#define PATH_TRANSFER 0x00008000
-#define PATH_TURNING 0x00010000
-#define PATH_WOUNDING 0x00020000
-#define PATH_DEATH 0x00040000
-#define PATH_LIGHT 0x00080000
+#define PATH_NULL 0x00000000 /* 0 */
+#define PATH_PROT 0x00000001 /* 1 */
+#define PATH_FIRE 0x00000002 /* 2 */
+#define PATH_FROST 0x00000004 /* 4 */
+#define PATH_ELEC 0x00000008 /* 8 */
+#define PATH_MISSILE 0x00000010 /* 16 */
+#define PATH_SELF 0x00000020 /* 32 */
+#define PATH_SUMMON 0x00000040 /* 64 */
+#define PATH_ABJURE 0x00000080 /* 128 */
+#define PATH_RESTORE 0x00000100 /* 256 */
+#define PATH_DETONATE 0x00000200 /* 512 */
+#define PATH_MIND 0x00000400 /* 1024 */
+#define PATH_CREATE 0x00000800 /* 2048 */
+#define PATH_TELE 0x00001000 /* 4096 */
+#define PATH_INFO 0x00002000 /* 8192 */
+#define PATH_TRANSMUTE 0x00004000 /* 16384 */
+#define PATH_TRANSFER 0x00008000 /* 32768 */
+#define PATH_TURNING 0x00010000 /* 65536 */
+#define PATH_WOUNDING 0x00020000 /* 131072 */
+#define PATH_DEATH 0x00040000 /* 262144 */
+#define PATH_LIGHT 0x00080000 /* 524288 */
#define NRSPELLPATHS 20
Index: crossfire/include/spellist.h
diff -u crossfire/include/spellist.h:1.8 crossfire/include/spellist.h:1.9
--- crossfire/include/spellist.h:1.8 Wed Jul 19 20:56:27 2000
+++ crossfire/include/spellist.h Mon Oct 16 12:26:38 2000
@@ -1,6 +1,6 @@
/*
* static char *rcsid_spellist_h =
- * "$Id: spellist.h,v 1.8 2000/07/20 03:56:27 peterm Exp $";
+ * "$Id: spellist.h,v 1.9 2000/10/16 19:26:38 peterm Exp $";
*/
/*
@@ -50,13 +50,13 @@
PATH_DETONATE, "bomb",},
{"summon golem", 2, 5, 10, 30, 1, 1, 8, 1, 1, 0, 0,
PATH_SUMMON, "golem",},
-{"summon fire elemental", 8,25, 4, 40, 1, 1, 2, 1, 1, 0, 0,
+{"summon fire elemental", 7,25, 4, 40, 1, 1, 2, 1, 1, 0, 0,
PATH_SUMMON, "fire_elemental",}, /* 10 */
-{"summon earth elemental", 5,15, 10, 40, 1, 1, 3, 1, 1, 0, 0,
+{"summon earth elemental", 4,15, 10, 40, 1, 1, 3, 1, 1, 0, 0,
PATH_SUMMON, "earth_elemental",},
-{"summon water elemental", 6,15, 8, 40, 1, 1, 4, 1, 1, 0, 0,
+{"summon water elemental", 5,15, 8, 40, 1, 1, 4, 1, 1, 0, 0,
PATH_SUMMON, "water_elemental",},
-{"summon air elemental", 7,20, 6, 40, 1, 1, 5, 1, 1, 0, 0,
+{"summon air elemental", 6,20, 6, 40, 1, 1, 5, 1, 1, 0, 0,
PATH_SUMMON, "air_elemental",},
{"dimension door", 10,25, 8, 1, 0, 0, 1, 1, 0, 0, 0,
PATH_TELE, "enchantment",},
Index: crossfire/include/sproto.h
diff -u crossfire/include/sproto.h:1.14 crossfire/include/sproto.h:1.15
--- crossfire/include/sproto.h:1.14 Thu Jun 8 17:21:25 2000
+++ crossfire/include/sproto.h Mon Oct 16 12:26:38 2000
@@ -377,7 +377,7 @@
extern object *get_player ( player *p, mapstruct *m );
extern object *get_nearest_player ( object *mon );
extern int path_to_player ( object *mon, object *pl, int mindiff );
-extern void give_initial_items ( object *pl );
+extern void give_initial_items ( object *pl ,treasurelist *items);
extern void get_name ( object *op );
extern void get_password ( object *op );
extern void play_again ( object *op );
@@ -628,7 +628,9 @@
extern void move_player_mover ( object *op );
extern void move_creator ( object *op );
extern void move_marker ( object *op );
+extern void apply_changes_to_player(object *player, object *change);
extern int process_object ( object *op );
+extern void move_player_changer(object *op);
#endif /* __STDC__ */
#endif /* __CEXTRACT__ */
More information about the crossfire
mailing list