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.87 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.91 by root, Wed Jul 4 06:38:35 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
325 * also have to catch is if this object is not using the normal name for 324 * also have to catch is if this object is not using the normal name for
326 * the object. In that case, we also want to use the loaded name. 325 * the object. In that case, we also want to use the loaded name.
327 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 328 */
330 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
331 name_pl = 0; 330 name_pl = 0;
332 331
333 if (!name_pl) 332 if (!name_pl)
334 name_pl = name; 333 name_pl = name;
335 334
410 { 409 {
411 object *tmp = get_archetype_by_object_name (slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 414 value = arch->value * inv->value;
416 } 415 }
417 416
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 418 {
420 if (stats.hp > stats.maxhp) 419 if (stats.hp > stats.maxhp)
1024 f.next (); 1023 f.next ();
1025 1024
1026 object *op = object::create (); 1025 object *op = object::create ();
1027 1026
1028 op->map = map; 1027 op->map = map;
1029 arch->clone.copy_to (op); 1028 arch->copy_to (op);
1030 // copy_to activates, this should be fixed properly 1029 // copy_to activates, this should be fixed properly
1031 op->deactivate (); 1030 op->deactivate ();
1032 1031
1033 if (!op->parse_kv (f)) 1032 if (!op->parse_kv (f))
1034 { 1033 {
1285 1284
1286 if (op->msg != tmp->msg) 1285 if (op->msg != tmp->msg)
1287 f.put (KW_msg, KW_endmsg, op->msg); 1286 f.put (KW_msg, KW_endmsg, op->msg);
1288 if (op->lore != tmp->lore) 1287 if (op->lore != tmp->lore)
1289 f.put (KW_lore, KW_endlore, op->lore); 1288 f.put (KW_lore, KW_endlore, op->lore);
1290 if (op->other_arch != tmp->other_arch) 1289
1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0); 1290 CMP_OUT (other_arch);
1292 1291
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1292 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1294 1293
1295 if (op->animation_id != tmp->animation_id) 1294 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1295 if (op->animation_id)
1297 { 1296 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1299 1298
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0); 1300 f.put (KW_is_animated, (sint32)0);
1302 } 1301 }
1303 else 1302 else
1304 f.put (KW_animation, (const char *) 0); 1303 f.put (KW_animation, (const char *)0);
1305 1304
1306 CMP_OUT2 (str, stats.Str); 1305 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1306 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1307 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1308 CMP_OUT2 (wis, stats.Wis);
1418 return true; 1417 return true;
1419 1418
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1419 archetype *at = arch ? (archetype *)arch : empty_archetype;
1421 1420
1422 f.put (KW_arch, at->archname); 1421 f.put (KW_arch, at->archname);
1423 write_diff (f, this, &at->clone); 1422 write_diff (f, this, at);
1424 1423
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1424 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1425 tmp->write (f);
1427 1426
1428 f.put (this); 1427 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines