Menu
▾
▴
[Havok-checkins] havokmud act.move.c,1.27.2.12,1.27.2.13 magic.c,1.52.2.17,1.52.2.18 magic2.c,1.42.2.11,1.42.2.12 magic3.c,1.80.2.14,1.80.2.15 spec_procs3.c,1.87.2.17,1.87.2.18 structs.h,1.121.2.16,1.121.2.17
|
From: Gavin H. <gjh...@us...> - 2004-07-18 21:07:12
|
Update of /cvsroot/havok/havokmud In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24930 Modified Files: Tag: rev_1_11 act.move.c magic.c magic2.c magic3.c spec_procs3.c structs.h Log Message: - fixed bug 992054 - stupid short int vnum in obj_data crashing on resurrect.. Index: structs.h =================================================================== RCS file: /cvsroot/havok/havokmud/structs.h,v retrieving revision 1.121.2.16 retrieving revision 1.121.2.17 diff -C2 -d -r1.121.2.16 -r1.121.2.17 *** structs.h 12 Jul 2004 05:42:59 -0000 1.121.2.16 --- structs.h 18 Jul 2004 21:07:00 -0000 1.121.2.17 *************** *** 616,620 **** */ struct obj_data { ! sh_int item_number; /* Where in data-base */ int in_room; /* In what room -1 when conta/carr */ struct obj_flag_data obj_flags; /* Object information */ --- 616,620 ---- */ struct obj_data { ! int item_number; /* Where in data-base */ int in_room; /* In what room -1 when conta/carr */ struct obj_flag_data obj_flags; /* Object information */ *************** *** 624,628 **** sh_int sector; /* for large rooms */ ! sh_int char_vnum; /* for ressurection */ long char_f_pos; /* for ressurection */ char *name; /* Title of object :get etc. */ --- 624,628 ---- sh_int sector; /* for large rooms */ ! int char_vnum; /* for ressurection */ long char_f_pos; /* for ressurection */ char *name; /* Title of object :get etc. */ Index: spec_procs3.c =================================================================== RCS file: /cvsroot/havok/havokmud/spec_procs3.c,v retrieving revision 1.87.2.17 retrieving revision 1.87.2.18 diff -C2 -d -r1.87.2.17 -r1.87.2.18 *** spec_procs3.c 16 Jul 2004 15:15:20 -0000 1.87.2.17 --- spec_procs3.c 18 Jul 2004 21:07:00 -0000 1.87.2.18 *************** *** 32,56 **** extern int rev_dir[]; - /* - * extern procedures - */ - int choose_exit_global(int a, int b, int c); - void hit(struct char_data *ch, struct char_data *victim, int type); - void gain_exp(struct char_data *ch, int gain); - - struct char_data *FindVictim(struct char_data *ch); - struct char_data *char_holding(struct obj_data *obj); - void send_to_all(char *messg); - int IsUndead(struct char_data *ch); - struct time_info_data age(struct char_data *ch); - int CountLims(struct obj_data *obj); - struct char_data *FindAnAttacker(struct char_data *ch); - void NailThisSucker(struct char_data *ch); - int NumCharmedFollowersInRoom(struct char_data *ch); - struct char_data *FindMobDiffZoneSameRace(struct char_data *ch); - struct char_data *FindMobInRoomWithFunction(int room, int (*func) ()); - void add_follower(struct char_data *ch, - struct char_data *leader); - void stop_follower(struct char_data *ch); int randomitem(void); --- 32,35 ---- Index: magic.c =================================================================== RCS file: /cvsroot/havok/havokmud/magic.c,v retrieving revision 1.52.2.17 retrieving revision 1.52.2.18 diff -C2 -d -r1.52.2.17 -r1.52.2.18 *** magic.c 14 Jul 2004 06:52:57 -0000 1.52.2.17 --- magic.c 18 Jul 2004 21:06:59 -0000 1.52.2.18 *************** *** 18,26 **** #define ASTRAL_ENTRANCE 2701 - void add_follower(struct char_data *ch, struct char_data *leader); - bool circle_follow(struct char_data *ch, struct char_data *victim); - void stop_follower(struct char_data *ch); - void sprintbit(unsigned long, char *[], char *); - /* * For future use in blinding those with infravision who are fireballed or --- 18,21 ---- Index: magic3.c =================================================================== RCS file: /cvsroot/havok/havokmud/magic3.c,v retrieving revision 1.80.2.14 retrieving revision 1.80.2.15 diff -C2 -d -r1.80.2.14 -r1.80.2.15 *** magic3.c 14 Jul 2004 06:52:57 -0000 1.80.2.14 --- magic3.c 18 Jul 2004 21:07:00 -0000 1.80.2.15 *************** *** 13,23 **** * Extern structures */ - #if 0 - void add_follower(struct char_data *ch, - struct char_data *leader); - bool circle_follow(struct char_data *ch, - struct char_data *victim); - void stop_follower(struct char_data *ch); - #endif --- 13,16 ---- Index: magic2.c =================================================================== RCS file: /cvsroot/havok/havokmud/magic2.c,v retrieving revision 1.42.2.11 retrieving revision 1.42.2.12 diff -C2 -d -r1.42.2.11 -r1.42.2.12 *** magic2.c 14 Jul 2004 06:52:57 -0000 1.42.2.11 --- magic2.c 18 Jul 2004 21:06:59 -0000 1.42.2.12 *************** *** 67,75 **** if (IsImmune(victim, IMM_CHARM) || IsResist(victim, IMM_CHARM) || IS_IMMORTAL(victim)) { ! act("$n says 'Thank you'", FALSE, ch, 0, victim, TO_ROOM); } else if (too_many_followers(ch)) { act("$N takes one look at the size of your posse and just says" " no!", TRUE, ch, 0, victim, TO_CHAR); ! act("You take one look at the size of $n's posse and just say" " no!", TRUE, ch, 0, victim, TO_ROOM); } else { --- 67,76 ---- if (IsImmune(victim, IMM_CHARM) || IsResist(victim, IMM_CHARM) || IS_IMMORTAL(victim)) { ! act("$N says 'Thank you'", FALSE, ch, 0, victim, TO_CHAR); ! act("$N says 'Thank you'", FALSE, ch, 0, victim, TO_ROOM); } else if (too_many_followers(ch)) { act("$N takes one look at the size of your posse and just says" " no!", TRUE, ch, 0, victim, TO_CHAR); ! act("$N takes one look at the size of $n's posse and just says" " no!", TRUE, ch, 0, victim, TO_ROOM); } else { Index: act.move.c =================================================================== RCS file: /cvsroot/havok/havokmud/act.move.c,v retrieving revision 1.27.2.12 retrieving revision 1.27.2.13 diff -C2 -d -r1.27.2.12 -r1.27.2.13 *** act.move.c 14 Jul 2004 06:52:54 -0000 1.27.2.12 --- act.move.c 18 Jul 2004 21:06:59 -0000 1.27.2.13 *************** *** 1744,1751 **** struct char_data *leader; - void stop_follower(struct char_data *ch); - void add_follower(struct char_data *ch, - struct char_data *leader); - dlog("in do_follow"); --- 1744,1747 ---- |