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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.37 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.41 by root, Sat Jun 9 21:16:12 2007 UTC

… …
337 move_bolt (tmp); 337 move_bolt (tmp);
338 338
339 return 1; 339 return 1;
340} 340}
341 341
342
343
344/*************************************************************************** 342/***************************************************************************
345 * 343 *
346 * BULLET/BALL CODE 344 * BULLET/BALL CODE
347 * 345 *
348 ***************************************************************************/ 346 ***************************************************************************/
… …
389 m->insert (tmp, dx, dy, op); 387 m->insert (tmp, dx, dy, op);
390 } 388 }
391 } 389 }
392 } 390 }
393} 391}
394
395 392
396/* Causes an object to explode, eg, a firebullet, 393/* Causes an object to explode, eg, a firebullet,
397 * poison cloud ball, etc. op is the object to 394 * poison cloud ball, etc. op is the object to
398 * explode. 395 * explode.
399 */ 396 */
… …
612 * we remove the magic flag - that can be derived from 609 * we remove the magic flag - that can be derived from
613 * spob->attacktype. 610 * spob->attacktype.
614 * This function sets up the appropriate owner and skill 611 * This function sets up the appropriate owner and skill
615 * pointers. 612 * pointers.
616 */ 613 */
617
618int 614int
619fire_bullet (object *op, object *caster, int dir, object *spob) 615fire_bullet (object *op, object *caster, int dir, object *spob)
620{ 616{
621 object *tmp = NULL; 617 object *tmp = NULL;
622 int mflags; 618 int mflags;
… …
820 816
821 /* Need to know what the movetype of the object we are about 817 /* Need to know what the movetype of the object we are about
822 * to create is, so we can know if the space we are about to 818 * to create is, so we can know if the space we are about to
823 * insert it into is blocked. 819 * insert it into is blocked.
824 */ 820 */
825 movetype = spell->other_arch->clone.move_type; 821 movetype = spell->other_arch->move_type;
826 822
827 for (i = range_min; i <= range_max; i++) 823 for (i = range_min; i <= range_max; i++)
828 { 824 {
829 sint16 x, y, d; 825 sint16 x, y, d;
830 826
… …
909 else 905 else
910 tmp->duration += caster->level / 3; 906 tmp->duration += caster->level / 3;
911 } 907 }
912 908
913 if (!(tmp->move_type & MOVE_FLY_LOW)) 909 if (!(tmp->move_type & MOVE_FLY_LOW))
914 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 910 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
915 911
916 if (!tmp->move_on && tmp->stats.dam) 912 if (!tmp->move_on && tmp->stats.dam)
917 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 913 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
918 914
919 m->insert (tmp, sx, sy, op); 915 m->insert (tmp, sx, sy, op);
920 916
921 /* This is used for tracking spells so that one effect doesn't hit 917 /* This is used for tracking spells so that one effect doesn't hit
922 * a single space too many times. 918 * a single space too many times.
… …
933/**************************************************************************** 929/****************************************************************************
934 * 930 *
935 * BOMB related code 931 * BOMB related code
936 * 932 *
937 ****************************************************************************/ 933 ****************************************************************************/
938
939 934
940/* This handles an exploding bomb. 935/* This handles an exploding bomb.
941 * op is the original bomb object. 936 * op is the original bomb object.
942 */ 937 */
943void 938void
… …
1047 * dir is the direction to look in. 1042 * dir is the direction to look in.
1048 * range is how far out to look. 1043 * range is how far out to look.
1049 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1044 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1050 * this info is used for blocked magic/unholy spaces. 1045 * this info is used for blocked magic/unholy spaces.
1051 */ 1046 */
1052
1053object * 1047object *
1054get_pointed_target (object *op, int dir, int range, int type) 1048get_pointed_target (object *op, int dir, int range, int type)
1055{ 1049{
1056 object *target; 1050 object *target;
1057 sint16 x, y; 1051 sint16 x, y;
… …
1076 return NULL; 1070 return NULL;
1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1071 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1078 return NULL; 1072 return NULL;
1079 1073
1080 if (mflags & P_IS_ALIVE) 1074 if (mflags & P_IS_ALIVE)
1081 {
1082 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1075 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1083 { 1076 if (QUERY_FLAG (target, FLAG_MONSTER))
1084 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1085 {
1086 return target; 1077 return target;
1087 }
1088 }
1089 }
1090 } 1078 }
1079
1091 return NULL; 1080 return NULL;
1092} 1081}
1093
1094 1082
1095/* cast_smite_arch() - the priest points to a creature and causes 1083/* cast_smite_arch() - the priest points to a creature and causes
1096 * a 'godly curse' to decend. 1084 * a 'godly curse' to decend.
1097 * usual params - 1085 * usual params -
1098 * op = player 1086 * op = player
… …
2099 if (infect_object (walk, disease, 1)) 2087 if (infect_object (walk, disease, 1))
2100 { 2088 {
2101 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2089 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2102 2090
2103 disease->destroy (); /* don't need this one anymore */ 2091 disease->destroy (); /* don't need this one anymore */
2104 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op); 2092 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2105 return 1; 2093 return 1;
2106 } 2094 }
2107 2095
2108 disease->destroy (); 2096 disease->destroy ();
2109 } 2097 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines