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.31 by root, Fri Mar 30 21:53:09 2007 UTC vs.
Revision 1.34 by root, Thu May 17 00:33:29 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
145 145
146 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
147 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
148 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
150 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1f;
151 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
152 new_bolt->duration++; 152 new_bolt->duration++;
153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
154 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
155 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
… …
245 else 245 else
246 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
247 object *tmp = op->clone (); 247 object *tmp = op->clone ();
248 248
249 m->insert (tmp, x, y, op); 249 m->insert (tmp, x, y, op);
250 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1f;
251 /* To make up for the decrease at the top of the function */ 251 /* To make up for the decrease at the top of the function */
252 tmp->duration++; 252 tmp->duration++;
253 253
254 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
255 * going off in other directions. 255 * going off in other directions.
… …
380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
381 { 381 {
382 object *tmp = op->clone (); 382 object *tmp = op->clone ();
383 383
384 tmp->state = 0; 384 tmp->state = 0;
385 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21f;
386 tmp->range--; 386 tmp->range--;
387 tmp->value = 0; 387 tmp->value = 0;
388 388
389 m->insert (tmp, dx, dy, op); 389 m->insert (tmp, dx, dy, op);
390 } 390 }
… …
1299 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name); 1299 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1300 return 0; 1300 return 0;
1301 } 1301 }
1302 return 1; 1302 return 1;
1303} 1303}
1304
1305
1306
1307 1304
1308int 1305int
1309cast_destruction (object *op, object *caster, object *spell_ob) 1306cast_destruction (object *op, object *caster, object *spell_ob)
1310{ 1307{
1311 int i, j, range, mflags, friendly = 0, dam, dur; 1308 int i, j, range, mflags, friendly = 0, dam, dur;
… …
1446 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1443 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1447 } 1444 }
1448 return 1; 1445 return 1;
1449 } 1446 }
1450 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1447 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1451 force->speed = 1.0; 1448 force->speed = 1.f;
1452 force->speed_left = -1.0; 1449 force->speed_left = -1.f;
1453 SET_FLAG (force, FLAG_APPLIED); 1450 SET_FLAG (force, FLAG_APPLIED);
1454 1451
1455 if (god) 1452 if (god)
1456 { 1453 {
1457 if (spell_ob->last_grace) 1454 if (spell_ob->last_grace)
… …
1603 1600
1604 /* aggravation */ 1601 /* aggravation */
1605 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1602 if (QUERY_FLAG (spell, FLAG_MONSTER))
1606 { 1603 {
1607 CLEAR_FLAG (head, FLAG_SLEEP); 1604 CLEAR_FLAG (head, FLAG_SLEEP);
1608 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1609 remove_friendly_object (head); 1605 remove_friendly_object (head);
1610
1611 done_one = 1; 1606 done_one = 1;
1612 head->enemy = op; 1607 head->enemy = op;
1613 } 1608 }
1614 1609
1615 /* calm monsters */ 1610 /* calm monsters */

Diff Legend

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