ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/monster.c
(Generate patch)

Comparing deliantra/server/server/monster.c (file contents):
Revision 1.1.1.1 by root, Fri Feb 3 07:14:33 2006 UTC vs.
Revision 1.3 by root, Fri Mar 10 14:08:38 2006 UTC

1/* 1/*
2 * static char *rcsid_monster_c = 2 * static char *rcsid_monster_c =
3 * "$Id: monster.c,v 1.1.1.1 2006/02/03 07:14:33 root Exp $"; 3 * "$Id: monster.c,v 1.3 2006/03/10 14:08:38 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
379 */ 379 */
380 if(QUERY_FLAG(op, FLAG_SCARED) &&!(RANDOM()%20)) { 380 if(QUERY_FLAG(op, FLAG_SCARED) &&!(RANDOM()%20)) {
381 CLEAR_FLAG(op,FLAG_SCARED); /* Time to regain some "guts"... */ 381 CLEAR_FLAG(op,FLAG_SCARED); /* Time to regain some "guts"... */
382 } 382 }
383 383
384 if (execute_event (op, EVENT_MOVE, op->enemy, 0, 0, SCRIPT_FIX_ALL))
385 return 0;
386
384 /* If we don't have an enemy, do special movement or the like */ 387 /* If we don't have an enemy, do special movement or the like */
385 if(!enemy) { 388 if(!enemy) {
386 if(QUERY_FLAG(op, FLAG_ONLY_ATTACK)) { 389 if(QUERY_FLAG(op, FLAG_ONLY_ATTACK)) {
387 remove_ob(op); 390 remove_ob(op);
388 free_object(op); 391 free_object(op);
1244 1247
1245 if (item->type == TREASURE && mon->will_apply & WILL_APPLY_TREASURE) flag=1; 1248 if (item->type == TREASURE && mon->will_apply & WILL_APPLY_TREASURE) flag=1;
1246 /* Eating food gets hp back */ 1249 /* Eating food gets hp back */
1247 else if (item->type == FOOD && mon->will_apply & WILL_APPLY_FOOD) flag=1; 1250 else if (item->type == FOOD && mon->will_apply & WILL_APPLY_FOOD) flag=1;
1248 else if (item->type == SCROLL && QUERY_FLAG(mon, FLAG_USE_SCROLL)) { 1251 else if (item->type == SCROLL && QUERY_FLAG(mon, FLAG_USE_SCROLL)) {
1249 if (monster_should_cast_spell(mon, item->inv)) 1252 if (item->inv && monster_should_cast_spell(mon, item->inv))
1250 SET_FLAG(mon, FLAG_READY_SCROLL); 1253 SET_FLAG(mon, FLAG_READY_SCROLL);
1251 /* Don't use it right now */ 1254 /* Don't use it right now */
1252 return; 1255 return;
1253 } 1256 }
1254 else if (item->type == WEAPON) flag = check_good_weapon(mon,item); 1257 else if (item->type == WEAPON) flag = check_good_weapon(mon,item);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines