[Havok-checkins] havokmud fight.c, 1.144, 1.145 magicutils.c, 1.13, 1.14 protos.h, 1.192, 1.193 skills_cleric.c, 1.9, 1.10 skills_druid.c, 1.6, 1.7 skills_generic_priest.c, 1.3, 1.4 skills_mage.c, 1.17, 1.18 skills_monk.c, 1.6, 1.7 skills_necromancer.c, 1.11, 1.12 skills_paladin.c, 1.6, 1.7 spec_procs.c, 1.60, 1.61 spec_procs3.c, 1.109, 1.110

[Anthony C. <dae...@us...>]

Update of /cvsroot/havok/havokmud
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29262

Modified Files:
	fight.c magicutils.c protos.h skills_cleric.c skills_druid.c 
	skills_generic_priest.c skills_mage.c skills_monk.c 
	skills_necromancer.c skills_paladin.c spec_procs.c 
	spec_procs3.c 
Log Message:
fight.c compiles with -Wextra


Index: spec_procs3.c
===================================================================
RCS file: /cvsroot/havok/havokmud/spec_procs3.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** spec_procs3.c	8 Jan 2008 07:27:12 -0000	1.109
--- spec_procs3.c	29 Feb 2008 19:06:52 -0000	1.110
***************
*** 2767,2771 ****
          }
          if (tar && (tar->in_room == ch->in_room)) {
!             if (HitOrMiss(ch, tar, CalcThaco(ch))) {
                  act("$n glares at $N with an evil eye!", 1, ch, 0, tar,
                      TO_NOTVICT);
--- 2767,2771 ----
          }
          if (tar && (tar->in_room == ch->in_room)) {
!             if (HitOrMiss(tar, CalcThaco(ch))) {
                  act("$n glares at $N with an evil eye!", 1, ch, 0, tar,
                      TO_NOTVICT);

Index: skills_necromancer.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_necromancer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** skills_necromancer.c	23 Dec 2007 07:55:54 -0000	1.11
--- skills_necromancer.c	29 Feb 2008 19:06:52 -0000	1.12
***************
*** 1905,1909 ****
  
      if (IS_SET(victim->specials.act, ACT_AGGRESSIVE) &&
!         HitOrMiss(ch, victim, CalcThaco(ch))) {
          REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
          done = 1;
--- 1905,1909 ----
  
      if (IS_SET(victim->specials.act, ACT_AGGRESSIVE) &&
!         HitOrMiss(victim, CalcThaco(ch))) {
          REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
          done = 1;
***************
*** 1911,1915 ****
  
      if (IS_SET(victim->specials.act, ACT_META_AGG) &&
!         HitOrMiss(ch, victim, CalcThaco(ch))) {
          REMOVE_BIT(victim->specials.act, ACT_META_AGG);
          done = 1;
--- 1911,1915 ----
  
      if (IS_SET(victim->specials.act, ACT_META_AGG) &&
!         HitOrMiss(victim, CalcThaco(ch))) {
          REMOVE_BIT(victim->specials.act, ACT_META_AGG);
          done = 1;

Index: skills_monk.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_monk.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** skills_monk.c	4 Dec 2007 20:34:30 -0000	1.6
--- skills_monk.c	29 Feb 2008 19:06:52 -0000	1.7
***************
*** 384,388 ****
              return;
          }
!         if (HitOrMiss(ch, victim, CalcThaco(ch))) {
              if (GET_POS(victim) > POSITION_DEAD) {
                  damage(ch, victim, GET_MAX_HIT(victim) * 20,
--- 384,388 ----
              return;
          }
!         if (HitOrMiss(victim, CalcThaco(ch))) {
              if (GET_POS(victim) > POSITION_DEAD) {
                  damage(ch, victim, GET_MAX_HIT(victim) * 20,
***************
*** 473,477 ****
          return;
      } else {
!         if (HitOrMiss(ch, victim, CalcThaco(ch))) {
              if (GET_POS(victim) > POSITION_DEAD) {
                  damage(ch, victim,
--- 473,477 ----
          return;
      } else {
!         if (HitOrMiss(victim, CalcThaco(ch))) {
              if (GET_POS(victim) > POSITION_DEAD) {
                  damage(ch, victim,

Index: skills_paladin.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_paladin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** skills_paladin.c	30 Jan 2005 03:29:38 -0000	1.6
--- skills_paladin.c	29 Feb 2008 19:06:52 -0000	1.7
***************
*** 834,838 ****
      if (IS_NPC(victim)) {
          if (IS_SET(victim->specials.act, ACT_AGGRESSIVE)) {
!             if (HitOrMiss(ch, victim, CalcThaco(ch))) {
                  REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
                  send_to_char("You feel peace and harmony surrounding you.\n\r",
--- 834,838 ----
      if (IS_NPC(victim)) {
          if (IS_SET(victim->specials.act, ACT_AGGRESSIVE)) {
!             if (HitOrMiss(victim, CalcThaco(ch))) {
                  REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
                  send_to_char("You feel peace and harmony surrounding you.\n\r",

Index: skills_cleric.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_cleric.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** skills_cleric.c	23 Dec 2007 07:55:54 -0000	1.9
--- skills_cleric.c	29 Feb 2008 19:06:52 -0000	1.10
***************
*** 1803,1807 ****
              dam = 0;
          }
!         if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
              dam = 0;
          }
--- 1803,1807 ----
              dam = 0;
          }
!         if (!HitOrMiss(victim, CalcThaco(ch))) {
              dam = 0;
          }

Index: skills_generic_priest.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_generic_priest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** skills_generic_priest.c	7 Jan 2008 04:20:26 -0000	1.3
--- skills_generic_priest.c	29 Feb 2008 19:06:52 -0000	1.4
***************
*** 908,912 ****
      dam = dice(3, 8) + 3;
  
!     if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
          dam = 0;
      }
--- 908,912 ----
      dam = dice(3, 8) + 3;
  
!     if (!HitOrMiss(victim, CalcThaco(ch))) {
          dam = 0;
      }
***************
*** 964,968 ****
      dam = dice(1, 8);
  
!     if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
          dam = 0;
      }
--- 964,968 ----
      dam = dice(1, 8);
  
!     if (!HitOrMiss(victim, CalcThaco(ch))) {
          dam = 0;
      }
***************
*** 1006,1010 ****
      dam = dice(2, 8) + 2;
  
!     if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
          dam = 0;
      }
--- 1006,1010 ----
      dam = dice(2, 8) + 2;
  
!     if (!HitOrMiss(victim, CalcThaco(ch))) {
          dam = 0;
      }

Index: skills_druid.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_druid.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** skills_druid.c	23 Dec 2007 07:55:54 -0000	1.6
--- skills_druid.c	29 Feb 2008 19:06:52 -0000	1.7
***************
*** 1226,1230 ****
      }
  
!     if (HitOrMiss(ch, victim, CalcThaco(ch))) {
          af.type = SPELL_HEAT_STUFF;
          af.duration = level;
--- 1226,1230 ----
      }
  
!     if (HitOrMiss(victim, CalcThaco(ch))) {
          af.type = SPELL_HEAT_STUFF;
          af.duration = level;

Index: protos.h
===================================================================
RCS file: /cvsroot/havok/havokmud/protos.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** protos.h	25 Feb 2008 21:59:12 -0000	1.192
--- protos.h	29 Feb 2008 19:06:52 -0000	1.193
***************
*** 619,627 ****
  int             Getw_type(struct obj_data *wielded);
  int             HitCheckDeny(struct char_data *ch,
!                              struct char_data *victim, int type,
                               int DistanceWeapon);
  int             CalcThaco(struct char_data *ch);
! int             HitOrMiss(struct char_data *ch, struct char_data *victim,
!                           int calc_thaco);
  void            MissVictim(struct char_data *ch, struct char_data *v,
                             int type, int w_type, int (*dam_func) ());
--- 619,626 ----
  int             Getw_type(struct obj_data *wielded);
  int             HitCheckDeny(struct char_data *ch,
!                              struct char_data *victim,
                               int DistanceWeapon);
  int             CalcThaco(struct char_data *ch);
! int             HitOrMiss(struct char_data *victim, int calc_thaco);
  void            MissVictim(struct char_data *ch, struct char_data *v,
                             int type, int w_type, int (*dam_func) ());
***************
*** 640,644 ****
  void            hit(struct char_data *ch, struct char_data *victim,
                      int type);
! void            perform_violence(int pulse);
  struct char_data *FindVictim(struct char_data *ch);
  struct char_data *FindAnyVictim(struct char_data *ch);
--- 639,643 ----
  void            hit(struct char_data *ch, struct char_data *victim,
                      int type);
! void            perform_violence();
  struct char_data *FindVictim(struct char_data *ch);
  struct char_data *FindAnyVictim(struct char_data *ch);
***************
*** 657,662 ****
                            struct obj_data *obj);
  void            DamageAllStuff(struct char_data *ch, int dam_type);
! int             DamageItem(struct char_data *ch, struct obj_data *o,
!                            int num);
  int             ItemSave(struct obj_data *i, int dam_type);
  int             DamagedByAttack(struct obj_data *i, int dam_type);
--- 656,660 ----
                            struct obj_data *obj);
  void            DamageAllStuff(struct char_data *ch, int dam_type);
! int             DamageItem(struct obj_data *o, int num);
  int             ItemSave(struct obj_data *i, int dam_type);
  int             DamagedByAttack(struct obj_data *i, int dam_type);

Index: fight.c
===================================================================
RCS file: /cvsroot/havok/havokmud/fight.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** fight.c	7 Jan 2008 04:20:25 -0000	1.144
--- fight.c	29 Feb 2008 19:06:51 -0000	1.145
***************
*** 2664,2668 ****
  }
  
! int HitCheckDeny(struct char_data *ch, struct char_data *victim, int type,
                   int DistanceWeapon)
  {
--- 2664,2668 ----
  }
  
! int HitCheckDeny(struct char_data *ch, struct char_data *victim,
                   int DistanceWeapon)
  {
***************
*** 2872,2876 ****
  }
  
! int HitOrMiss(struct char_data *ch, struct char_data *victim, int calc_thaco)
  {
      int             diceroll,
--- 2872,2876 ----
  }
  
! int HitOrMiss(struct char_data *victim, int calc_thaco)
  {
      int             diceroll,
***************
*** 3156,3160 ****
       */
  
!     if (HitCheckDeny(ch, victim, type, DistanceWeapon)) {
          return;
      }
--- 3156,3160 ----
       */
  
!     if (HitCheckDeny(ch, victim, DistanceWeapon)) {
          return;
      }
***************
*** 3169,3173 ****
      WeaponSkillCheck(ch);
  
!     if (HitOrMiss(ch, victim, thaco)) {
          if ((dam = GetWeaponDam(ch, victim, wielded)) > 0) {
              if (number(1, 4) == 1) {
--- 3169,3173 ----
      WeaponSkillCheck(ch);
  
!     if (HitOrMiss(victim, thaco)) {
          if ((dam = GetWeaponDam(ch, victim, wielded)) > 0) {
              if (number(1, 4) == 1) {
***************
*** 3216,3220 ****
      if (IS_AFFECTED(victim, AFF_BLADE_BARRIER) &&
          !IS_AFFECTED(ch, AFF_BLADE_BARRIER)) {
!         if (HitOrMiss(victim, ch, CalcThaco(victim))) {
              dam = dice(3, 8);
              if (damage(victim, ch, dam, SPELL_BLADE_BARRIER) &&
--- 3216,3220 ----
      if (IS_AFFECTED(victim, AFF_BLADE_BARRIER) &&
          !IS_AFFECTED(ch, AFF_BLADE_BARRIER)) {
!         if (HitOrMiss(ch, CalcThaco(victim))) {
              dam = dice(3, 8);
              if (damage(victim, ch, dam, SPELL_BLADE_BARRIER) &&
***************
*** 3233,3237 ****
   * control the fights going on
   */
! void perform_violence(int pulse)
  {
      struct follow_type *f;
--- 3233,3237 ----
   * control the fights going on
   */
! void perform_violence()
  {
      struct follow_type *f;
***************
*** 4690,4694 ****
                   */
                  return (TRUE);
!             } else if (DamageItem(ch, obj, num)) {
                  /*
                   * "damage item" (armor), (weapon)
--- 4690,4694 ----
                   */
                  return (TRUE);
!             } else if (DamageItem(obj, num)) {
                  /*
                   * "damage item" (armor), (weapon)
***************
*** 4809,4813 ****
  }
  
! int DamageItem(struct char_data *ch, struct obj_data *o, int num)
  {
      /*
--- 4809,4813 ----
  }
  
! int DamageItem(struct obj_data *o, int num)
  {
      /*
***************
*** 5366,5369 ****
--- 5366,5377 ----
  void shoot(struct char_data *ch, struct char_data *victim)
  {
+     if (ch || victim) {
+         /*
+          * check to avoid compiler warnings for unused
+          * parameters.  Remove this when shoot is no
+          * longer commented out
+          */
+     }
+ 
  #if 0
      struct obj_data *bow,

Index: spec_procs.c
===================================================================
RCS file: /cvsroot/havok/havokmud/spec_procs.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** spec_procs.c	7 Jan 2008 04:20:26 -0000	1.60
--- spec_procs.c	29 Feb 2008 19:06:52 -0000	1.61
***************
*** 813,817 ****
          !IS_AFFECTED(tar, AFF_PROTECT_FROM_EVIL) &&
          !IS_AFFECTED(tar, AFF_SANCTUARY) &&
!         HitOrMiss(ch, tar, CalcThaco(ch))) {
  
          act("$n touches $N!", 1, ch, 0, tar, TO_NOTVICT);
--- 813,817 ----
          !IS_AFFECTED(tar, AFF_PROTECT_FROM_EVIL) &&
          !IS_AFFECTED(tar, AFF_SANCTUARY) &&
!         HitOrMiss(tar, CalcThaco(ch))) {
  
          act("$n touches $N!", 1, ch, 0, tar, TO_NOTVICT);
***************
*** 839,843 ****
          }
          if (tar && tar->in_room == ch->in_room &&
!             HitOrMiss(ch, tar, CalcThaco(ch))) {
              act("$n touches $N!", 1, ch, 0, tar, TO_NOTVICT);
              act("$n touches you!", 1, ch, 0, tar, TO_VICT);
--- 839,843 ----
          }
          if (tar && tar->in_room == ch->in_room &&
!             HitOrMiss(tar, CalcThaco(ch))) {
              act("$n touches $N!", 1, ch, 0, tar, TO_NOTVICT);
              act("$n touches you!", 1, ch, 0, tar, TO_VICT);

Index: magicutils.c
===================================================================
RCS file: /cvsroot/havok/havokmud/magicutils.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** magicutils.c	8 Jan 2008 07:27:09 -0000	1.13
--- magicutils.c	29 Feb 2008 19:06:52 -0000	1.14
***************
*** 523,527 ****
          dam = 0;
      }
!     if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
          dam = 0;
      }
--- 523,527 ----
          dam = 0;
      }
!     if (!HitOrMiss(victim, CalcThaco(ch))) {
          dam = 0;
      }

Index: skills_mage.c
===================================================================
RCS file: /cvsroot/havok/havokmud/skills_mage.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** skills_mage.c	8 Jan 2008 07:27:12 -0000	1.17
--- skills_mage.c	29 Feb 2008 19:06:52 -0000	1.18
***************
*** 548,552 ****
          if (IS_SET(victim->specials.act, ACT_AGGRESSIVE) ||
              IS_SET(victim->specials.act, ACT_META_AGG)) {
!             if (HitOrMiss(ch, victim, CalcThaco(ch))) {
                  if (IS_SET(victim->specials.act, ACT_AGGRESSIVE)) {
                      REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
--- 548,552 ----
          if (IS_SET(victim->specials.act, ACT_AGGRESSIVE) ||
              IS_SET(victim->specials.act, ACT_META_AGG)) {
!             if (HitOrMiss(victim, CalcThaco(ch))) {
                  if (IS_SET(victim->specials.act, ACT_AGGRESSIVE)) {
                      REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
***************
*** 558,562 ****
              } else if (ChSpec(ch, victim, MA_ENCHANTMENT_SPEC) ||
              		   ChSpec(ch, victim, MA_ILLUSION_SPEC)) {
! 			    if (HitOrMiss(ch, victim, CalcThaco(ch))) {
  					REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
  				}
--- 558,562 ----
              } else if (ChSpec(ch, victim, MA_ENCHANTMENT_SPEC) ||
              		   ChSpec(ch, victim, MA_ILLUSION_SPEC)) {
! 			    if (HitOrMiss(victim, CalcThaco(ch))) {
  					REMOVE_BIT(victim->specials.act, ACT_AGGRESSIVE);
  				}
***************
*** 5315,5319 ****
      }
  
!     if (!HitOrMiss(ch, victim, CalcThaco(ch))) {
          dam = 0;
      }
--- 5315,5319 ----
      }
  
!     if (!HitOrMiss(victim, CalcThaco(ch))) {
          dam = 0;
      }