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.64 by root, Mon Sep 29 06:32:09 2008 UTC vs.
Revision 1.69 by root, Thu Dec 4 01:07:35 2008 UTC

… …
165 sint16 x, y; 165 sint16 x, y;
166 maptile *m; 166 maptile *m;
167 167
168 if (--op->duration < 0) 168 if (--op->duration < 0)
169 { 169 {
170 op->destroy (); 170 op->drop_and_destroy ();
171 return; 171 return;
172 } 172 }
173 173
174 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
175 175
… …
307 307
308 maptile *newmap; 308 maptile *newmap;
309 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 309 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
310 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
311 { 311 {
312 tmp->destroy (); 312 tmp->drop_and_destroy ();
313 return 0; 313 return 0;
314 } 314 }
315 315
316 tmp->map = newmap; 316 tmp->map = newmap;
317 317
318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
319 { 319 {
320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
321 { 321 {
322 tmp->destroy (); 322 tmp->drop_and_destroy ();
323 return 0; 323 return 0;
324 } 324 }
325 325
326 tmp->x = op->x; 326 tmp->x = op->x;
327 tmp->y = op->y; 327 tmp->y = op->y;
… …
445 tmp->set_owner (op); 445 tmp->set_owner (op);
446 tmp->skill = op->skill; 446 tmp->skill = op->skill;
447 447
448 owner = op->owner; 448 owner = op->owner;
449 449
450 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 450 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER)
452 && owner
453 && !tailor_god_spell (tmp, owner))
451 { 454 {
452 op->destroy (); 455 op->destroy ();
453 return; 456 return;
454 } 457 }
455 458
… …
521 { 524 {
522 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
523 { 526 {
524 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
525 528
529 // TODO: can't understand the following if's
526 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
527 { 531 {
528 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
529 { 533 {
530 op->destroy (); 534 op->destroy ();
… …
733 } 737 }
734#endif 738#endif
735 739
736 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
737 741
742 if (!op->is_on_map ())
743 return;
744
738 /* Check to see if we should push anything. 745 /* Check to see if we should push anything.
739 * Spell objects with weight push whatever they encounter to some 746 * Spell objects with weight push whatever they encounter to some
740 * degree. 747 * degree.
741 */ 748 */
742 if (op->weight) 749 if (op->weight)
750 {
743 check_spell_knockback (op); 751 check_spell_knockback (op);
744 752
745 if (op->destroyed ()) 753 if (!op->is_on_map ())
746 return; 754 return;
755 }
747 756
748 if (op->duration-- < 0) 757 if (op->duration-- < 0)
749 { 758 {
750 op->destroy (); 759 op->destroy ();
751 return; 760 return;
… …
1179void 1188void
1180move_missile (object *op) 1189move_missile (object *op)
1181{ 1190{
1182 if (op->range-- <= 0) 1191 if (op->range-- <= 0)
1183 { 1192 {
1184 op->destroy (); 1193 op->drop_and_destroy ();
1185 return; 1194 return;
1186 } 1195 }
1187 1196
1188 mapxy pos (op); 1197 mapxy pos (op);
1189 pos.move (op->direction); 1198 pos.move (op->direction);
… …
1241 1250
1242 object *tmp = get_archetype (FORCE_NAME); 1251 object *tmp = get_archetype (FORCE_NAME);
1243 tmp->speed = 0.01; 1252 tmp->speed = 0.01;
1244 tmp->stats.food = time; 1253 tmp->stats.food = time;
1245 SET_FLAG (tmp, FLAG_IS_USED_UP); 1254 SET_FLAG (tmp, FLAG_IS_USED_UP);
1246 tmp->glow_radius = radius;
1247 if (tmp->glow_radius > MAX_LIGHT_RADII)
1248 tmp->glow_radius = MAX_LIGHT_RADII; 1255 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
1249
1250 tmp = insert_ob_in_ob (tmp, op); 1256 tmp = insert_ob_in_ob (tmp, op);
1251 1257
1252 if (tmp->glow_radius > op->glow_radius) 1258 if (tmp->glow_radius > op->glow_radius)
1253 op->glow_radius = tmp->glow_radius; 1259 op->glow_radius = tmp->glow_radius;
1254 1260
… …
1739 return; 1745 return;
1740 } 1746 }
1741 1747
1742 if (!op->duration || !owner->is_on_map ()) 1748 if (!op->duration || !owner->is_on_map ())
1743 { 1749 {
1744 op->destroy (); 1750 op->drop_and_destroy ();
1745 return; 1751 return;
1746 } 1752 }
1747 1753
1748 op->duration--; 1754 op->duration--;
1749 1755
… …
1881 int dam, mflags; 1887 int dam, mflags;
1882 maptile *m; 1888 maptile *m;
1883 1889
1884 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1890 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1885 1891
1886 if (!dir) 1892 if (dir)
1887 {
1888 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1889 return 0;
1890 } 1893 {
1891
1892 x = op->x + freearr_x[dir]; 1894 x = op->x + freearr_x[dir];
1893 y = op->y + freearr_y[dir]; 1895 y = op->y + freearr_y[dir];
1894 m = op->map; 1896 m = op->map;
1895 1897
1896 mflags = get_map_flags (m, &m, x, y, &x, &y); 1898 mflags = get_map_flags (m, &m, x, y, &x, &y);
1897 1899
1898 if (mflags & P_OUT_OF_MAP) 1900 if (mflags & P_OUT_OF_MAP)
1899 { 1901 {
1900 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1902 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1901 return 0; 1903 return 0;
1902 } 1904 }
1903 1905
1904 if (mflags & P_IS_ALIVE && spell->attacktype) 1906 if (mflags & P_IS_ALIVE && spell->attacktype)
1905 { 1907 {
1906 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1908 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1907 if (QUERY_FLAG (target, FLAG_MONSTER)) 1909 if (QUERY_FLAG (target, FLAG_MONSTER))
1908 { 1910 {
1909 /* oky doky. got a target monster. Lets make a blinding attack */ 1911 /* oky doky. got a target monster. Lets make a blinding attack */
1910 if (target->head) 1912 if (target->head)
1911 target = target->head; 1913 target = target->head;
1912 1914
1913 hit_player (target, dam, op, spell->attacktype, 1); 1915 hit_player (target, dam, op, spell->attacktype, 1);
1914 return 1; /* one success only! */ 1916 return 1; /* one success only! */
1917 }
1915 } 1918 }
1916 }
1917 1919
1918 /* no live target, perhaps a wall is in the way? */ 1920 /* no live target, perhaps a wall is in the way? */
1919 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1921 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1920 { 1922 {
1921 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1923 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1922 return 0; 1924 return 0;
1925 }
1923 } 1926 }
1924 1927
1925 /* ok, looks groovy to just insert a new light on the map */ 1928 /* ok, looks groovy to just insert a new light on the map */
1926 tmp = arch_to_object (spell->other_arch); 1929 tmp = arch_to_object (spell->other_arch);
1927 if (!tmp) 1930 if (!tmp)
1928 { 1931 {
1929 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1932 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1930 return 0; 1933 return 0;
1931 } 1934 }
1935
1932 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1936 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1937
1933 if (tmp->glow_radius) 1938 if (tmp->glow_radius)
1934 {
1935 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1939 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
1936 if (tmp->glow_radius > MAX_LIGHT_RADII)
1937 tmp->glow_radius = MAX_LIGHT_RADII;
1938 }
1939 1940
1941 if (dir)
1940 m->insert (tmp, x, y, op); 1942 m->insert (tmp, x, y, op);
1943 else
1944 caster->outer_env ()->insert (tmp);
1945
1941 return 1; 1946 return 1;
1942} 1947}
1943 1948
1944/* cast_cause_disease: this spell looks along <dir> from the 1949/* cast_cause_disease: this spell looks along <dir> from the
1945 * player and infects someone. 1950 * player and infects someone.

Diff Legend

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