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.101 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.107 by root, Fri Apr 11 14:09:56 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
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 Deliantra 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 8 * Deliantra 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
169 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
170 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
171 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
172 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
173 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
174 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
175 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
176 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
177 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
178 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
179 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
529 { 529 {
530 switch (f.kw) 530 switch (f.kw)
531 { 531 {
532 case KW_uuid: 532 case KW_uuid:
533 if (const char *s = f.get_str ()) 533 if (const char *s = f.get_str ())
534 { 534 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 535 {
540 uuid.seq = seq; 536 f.parse_warn ("unparseable uuid");
541 break; 537 uuid = UUID::gen ();
542 } 538 }
543 }
544
545 uuid = gen_uuid ();
546 break; 539 break;
547 540
548 case KW_oid: 541 case KW_oid:
549 f.get (this, f.get_sint32 ()); 542 f.get (this, f.get_sint32 ());
550 break; 543 break;
… …
556 549
557 case KW_attach: f.get_ornull (attach); break; 550 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 551 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 552 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 553 case KW_slaying: f.get_ornull (slaying); break;
554 case KW_tag: f.get_ornull (tag); break;
561 555
562 case KW_arch: 556 case KW_arch:
563 { 557 {
564 object *tmp = object::read (f); 558 object *tmp = object::read (f);
565 tmp->deactivate (); 559 tmp->deactivate ();
… …
567 { 561 {
568 // was: insert_ob_in_ob (tmp, op); 562 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 563 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 564 // also, appending instead of prepending keeps the
571 // save ordering the same between repeated load/saves. 565 // save ordering the same between repeated load/saves.
566 // and finally we do not want any funny effects
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 567 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 568 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 569
575 if (!op_inv) 570 if (!op_inv)
576 { 571 {
… …
598 loading_arch 593 loading_arch
599 ? archetype::get (f.get_str ()) 594 ? archetype::get (f.get_str ())
600 : archetype::find (f.get_str ()); 595 : archetype::find (f.get_str ());
601 596
602 if (!other_arch) 597 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 598 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
604 break; 599 break;
605 600
606 case KW_owner: 601 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ()); 602 f.delayed_deref (this, owner, f.get_str ());
608 break; 603 break;
… …
1266 1261
1267 /* We don't need to worry about the arch's extra fields - they 1262 /* We don't need to worry about the arch's extra fields - they
1268 * will get taken care of the copy_to method. 1263 * will get taken care of the copy_to method.
1269 */ 1264 */
1270 1265
1271 { 1266 f.put (KW_uuid, op->uuid.c_str ());
1272 char uids[64];
1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1274 f.put (KW_uuid, (const char *)uids);
1275 }
1276 1267
1277#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1268#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1278#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1269#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1279 1270
1280 if (object *owner = op->owner) 1271 if (object *owner = op->owner)
… …
1284 CMP_OUT (name_pl); 1275 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1276 CMP_OUT (custom_name);
1286 CMP_OUT (title); 1277 CMP_OUT (title);
1287 CMP_OUT (race); 1278 CMP_OUT (race);
1288 CMP_OUT (slaying); 1279 CMP_OUT (slaying);
1280 CMP_OUT (tag);
1289 CMP_OUT (other_arch); 1281 CMP_OUT (other_arch);
1290 1282
1291 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1292 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1293 1285

Diff Legend

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