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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.38 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.40 by pippijn, Sat Jan 6 14:42:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
320 { 321 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322 op->gen_sp_armour = op->last_heal; 323 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 324 op->last_heal = 0;
324 } 325 }
325 if (editor) 326
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 329 if (!op->item_power && ip)
331 { 330 {
332 if (ip > 3) 331 if (ip > 3)
333 { 332 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines