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.84 by root, Tue May 22 10:49:58 2007 UTC vs.
Revision 1.88 by root, Mon Jun 4 13:04:00 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
325 * also have to catch is if this object is not using the normal name for 325 * 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. 326 * 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 327 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 328 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 329 */
330 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 330 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
331 name_pl = 0; 331 name_pl = 0;
332 332
333 if (!name_pl) 333 if (!name_pl)
334 name_pl = name; 334 name_pl = name;
335 335
410 { 410 {
411 object *tmp = get_archetype_by_object_name (slaying); 411 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 412 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 413 randomitems = NULL; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 414 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 415 value = arch->value * inv->value;
416 } 416 }
417 417
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 418 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 419 {
420 if (stats.hp > stats.maxhp) 420 if (stats.hp > stats.maxhp)
517 517
518next: ; 518next: ;
519 } 519 }
520} 520}
521 521
522#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
523 if (f.get_sint32 ()) \
524 SET_FLAG (op, flag); \
525 else \
526 CLEAR_FLAG (op, flag) \
527 523
528bool 524bool
529object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
530{ 526{
531 object *op_inv = inv; 527 object *op_inv = inv;
777 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 773 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
778 774
779 break; 775 break;
780 776
781 case KW_friendly: 777 case KW_friendly:
782 if (f.get_sint32 ()) 778 if (f.get_bool ())
783 if (type != PLAYER) 779 if (type != PLAYER)
784 add_friendly_object (this); 780 add_friendly_object (this);
785 781
786 break; 782 break;
787 783
1028 f.next (); 1024 f.next ();
1029 1025
1030 object *op = object::create (); 1026 object *op = object::create ();
1031 1027
1032 op->map = map; 1028 op->map = map;
1033 arch->clone.copy_to (op); 1029 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1030 // copy_to activates, this should be fixed properly
1035 op->deactivate (); 1031 op->deactivate ();
1036 1032
1037 if (!op->parse_kv (f)) 1033 if (!op->parse_kv (f))
1038 { 1034 {
1289 1285
1290 if (op->msg != tmp->msg) 1286 if (op->msg != tmp->msg)
1291 f.put (KW_msg, KW_endmsg, op->msg); 1287 f.put (KW_msg, KW_endmsg, op->msg);
1292 if (op->lore != tmp->lore) 1288 if (op->lore != tmp->lore)
1293 f.put (KW_lore, KW_endlore, op->lore); 1289 f.put (KW_lore, KW_endlore, op->lore);
1294 1290 if (op->other_arch != tmp->other_arch)
1295 CMP_OUT (other_arch); 1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
1296 1292
1297 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1298 1294
1299 if (op->animation_id != tmp->animation_id) 1295 if (op->animation_id != tmp->animation_id)
1300 if (op->animation_id) 1296 if (op->animation_id)
1421 if (owner) 1417 if (owner)
1422 return true; 1418 return true;
1423 1419
1424 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1425 1421
1426 f.put (KW_arch, at->name); 1422 f.put (KW_arch, at->archname);
1427 write_diff (f, this, &at->clone); 1423 write_diff (f, this, at);
1428 1424
1429 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1430 tmp->write (f); 1426 tmp->write (f);
1431 1427
1432 f.put (this); 1428 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines