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.90 by root, Sun Jul 1 05:00:17 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <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.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
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)
… …
517 516
518next: ; 517next: ;
519 } 518 }
520} 519}
521 520
522#define GET_FLAG(op,flag) \ 521#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 522
528bool 523bool
529object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
530{ 525{
531 object *op_inv = inv; 526 object *op_inv = inv;
… …
777 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 772 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
778 773
779 break; 774 break;
780 775
781 case KW_friendly: 776 case KW_friendly:
782 if (f.get_sint32 ()) 777 if (f.get_bool ())
783 if (type != PLAYER) 778 if (type != PLAYER)
784 add_friendly_object (this); 779 add_friendly_object (this);
785 780
786 break; 781 break;
787 782
… …
1028 f.next (); 1023 f.next ();
1029 1024
1030 object *op = object::create (); 1025 object *op = object::create ();
1031 1026
1032 op->map = map; 1027 op->map = map;
1033 arch->clone.copy_to (op); 1028 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1029 // copy_to activates, this should be fixed properly
1035 op->deactivate (); 1030 op->deactivate ();
1036 1031
1037 if (!op->parse_kv (f)) 1032 if (!op->parse_kv (f))
1038 { 1033 {
… …
1421 if (owner) 1416 if (owner)
1422 return true; 1417 return true;
1423 1418
1424 archetype *at = arch ? (archetype *)arch : empty_archetype; 1419 archetype *at = arch ? (archetype *)arch : empty_archetype;
1425 1420
1426 f.put (KW_arch, at->name); 1421 f.put (KW_arch, at->archname);
1427 write_diff (f, this, &at->clone); 1422 write_diff (f, this, at);
1428 1423
1429 for (object *tmp = inv; tmp; tmp = tmp->below) 1424 for (object *tmp = inv; tmp; tmp = tmp->below)
1430 tmp->write (f); 1425 tmp->write (f);
1431 1426
1432 f.put (this); 1427 f.put (this);

Diff Legend

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