YMBF (yet more bug fixes :)

[Moonchilde <jtraub+@cmu.edu>]

Frank (and all)
Here are a few more bug fixes.  They fix the problems that elementals would
crash the game if they walked off the edge of the map.  Also, Elementals
would not be able to be controlled UNLESS you also had enough spell points to
recast the spell.  This has been fixed as well.

Enjoy.
--JT
-------------------------cut here-----------------------------
*** spells.c.old	Thu Sep 24 17:27:23 1992
--- spells.c	Thu Sep 24 17:39:53 1992
***************
*** 50,56 ****
      fprintf(stderr,"Error, unknown spell: %d\n",type);
      return;
    }
!   if(!IS_WIZ(op)&&op->stats.sp<s->sp&&!(type==SP_GOLEM&&op->contr->golem!=NULL)) {
      draw_info(op,"You don't have enough spellpoints.");
      op->contr->count_left=0;
      return;
--- 50,57 ----
      fprintf(stderr,"Error, unknown spell: %d\n",type);
      return;
    }
!   if(!IS_WIZ(op)&&op->stats.sp<s->sp &&
!      !(IS_SUMMON_SPELL(type)&&op->contr->golem!=NULL)) {
      draw_info(op,"You don't have enough spellpoints.");
      op->contr->count_left=0;
      return;
***************
*** 507,513 ****
      free_object(op);
      return;
    }
!   if(!move_ob(op,op->direction)) {
      update_object(op);
      hit_map(op,op->direction,AT_PHYSICAL);
      for(tmp=get_map_ob(op->map,op->x+freearr_x[op->direction],
--- 508,516 ----
      free_object(op);
      return;
    }
!   if(!move_ob(op,op->direction)&&
!      !out_of_map(op->map,op->x+freearr_x[op->direction],
!                  op->y+freearr_y[op->direction])) {
      update_object(op);
      hit_map(op,op->direction,AT_PHYSICAL);
      for(tmp=get_map_ob(op->map,op->x+freearr_x[op->direction],
*** spells.h.old	Thu Sep 24 17:37:53 1992
--- spells.h	Thu Sep 24 17:40:08 1992
***************
*** 63,65 ****
--- 63,67 ----
  "fear",				4,10,
  "poison cloud",			2, 5
  };
+ 
+ #define IS_SUMMON_SPELL(spell) ((spell) > SP_BOMB && (spell) < SP_D_DOOR)
-------------------------------------------------------------------------
Practice random kindness and senseless acts of beauty --Anonymous
Argue for your limitations and sure enough they're yours --Richard Bach
Isn't humanity egocentric? Whenever we talk, we say "Here's my two cents
  worth," but we only offer "a penny for your thoughts." --ariel@cs.ucla.edu

Moonchilde/Amythyst/JT Traub ---           jtraub@cmu.edu