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.93 by root, Tue Jul 31 17:33:14 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. */
… …
28#include <global.h> 28#include <global.h>
29#include <loader.h> 29#include <loader.h>
30#include <sproto.h> 30#include <sproto.h>
31 31
32///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
33 35
34/* This table is only necessary to convert objects that existed before the 36/* This table is only necessary to convert objects that existed before the
35 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
36 * to go through every mapping looking for every potion, rod, wand, etc 38 * to go through every mapping looking for every potion, rod, wand, etc
37 * that had a sp set and update to the new value. So this maps the 39 * that had a sp set and update to the new value. So this maps the
… …
167 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
168 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
169 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
170 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
171 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
172 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
173 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
174 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
175 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
176 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
177 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
249 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
250 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
251 NULL 253 NULL
252}; 254};
253 255
254extern bool loading_arch;
255
256/* This function checks the object after it has been loaded (when we 256/* This function checks the object after it has been loaded (when we
257 * get the 'end' in the input stream). This function can be used to 257 * get the 'end' in the input stream). This function can be used to
258 * deal with legacy objects where fields may have changed. It can also be used 258 * deal with legacy objects where fields may have changed. It can also be used
259 * to check for objects to make sure there are no common errors. 259 * to check for objects to make sure there are no common errors.
260 */ 260 */
… …
394 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
398 { 398 {
399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 400 * in that spell was stored in sp.
401 */ 401 */
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 403 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
… …
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 ()));
599 break;
600
601 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ());
604 break; 603 break;
605 604
606 case KW_animation: 605 case KW_animation:
607 { 606 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 607 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
640 break; 639 break;
641 640
642 case KW_sound: 641 case KW_sound:
643 sound = sound_find (f.get_str ()); 642 sound = sound_find (f.get_str ());
644 if (!sound) 643 if (!sound)
645 sound = face_find (f.get_str ());//TODO: really fall back to face name? 644 f.parse_warn ("sound not found");
645 break;
646
647 case KW_sound_destroy:
648 sound_destroy = sound_find (f.get_str ());
649 if (!sound_destroy)
650 f.parse_warn ("sound not found");
646 break; 651 break;
647 652
648 case KW_x: f.get (x); break; 653 case KW_x: f.get (x); break;
649 case KW_y: f.get (y); break; 654 case KW_y: f.get (y); break;
650 655
… …
1041int 1046int
1042set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1043{ 1048{
1044 object_thawer f (buf, (AV *)0); 1049 object_thawer f (buf, (AV *)0);
1045 1050
1046 f.next ();
1047 return op->parse_kv (f); 1051 return op->parse_kv (f);
1048} 1052}
1049 1053
1050/* This returns a string of the integer movement type */ 1054/* This returns a string of the integer movement type */
1051#if 0 1055#if 0
… …
1257 1261
1258 /* 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
1259 * will get taken care of the copy_to method. 1263 * will get taken care of the copy_to method.
1260 */ 1264 */
1261 1265
1262 { 1266 f.put (KW_uuid, op->uuid.c_str ());
1263 char uids[64];
1264 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1265 f.put (KW_uuid, (const char *)uids);
1266 }
1267 1267
1268#define CMP_OUT(v) if (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)
1269#define CMP_OUT2(k,v) if (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)
1270
1271 if (object *owner = op->owner)
1272 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1270 1273
1271 CMP_OUT (name); 1274 CMP_OUT (name);
1272 CMP_OUT (name_pl); 1275 CMP_OUT (name_pl);
1273 CMP_OUT (custom_name); 1276 CMP_OUT (custom_name);
1274 CMP_OUT (title); 1277 CMP_OUT (title);
1275 CMP_OUT (race); 1278 CMP_OUT (race);
1276 CMP_OUT (slaying); 1279 CMP_OUT (slaying);
1280 CMP_OUT (tag);
1277 CMP_OUT (other_arch); 1281 CMP_OUT (other_arch);
1278 1282
1279 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 );
1280 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);
1281 1285
1282 if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0);
1283 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1284 1289
1285 if (op->animation_id != tmp->animation_id) 1290 if (op->animation_id != tmp->animation_id)
1286 if (op->animation_id) 1291 if (op->animation_id)
1287 { 1292 {
1288 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1330 CMP_OUT (type); 1335 CMP_OUT (type);
1331 CMP_OUT (subtype); 1336 CMP_OUT (subtype);
1332 CMP_OUT (attacktype); 1337 CMP_OUT (attacktype);
1333 1338
1334 for (i = 0; i < NROFATTACKS; i++) 1339 for (i = 0; i < NROFATTACKS; i++)
1335 if (op->resist[i] != tmp->resist[i]) 1340 if (expect_false (op->resist[i] != tmp->resist[i]))
1336 f.put (resist_save[i], op->resist[i]); 1341 f.put (resist_save[i], op->resist[i]);
1337 1342
1338 CMP_OUT (path_attuned); 1343 CMP_OUT (path_attuned);
1339 CMP_OUT (path_repelled); 1344 CMP_OUT (path_repelled);
1340 CMP_OUT (path_denied); 1345 CMP_OUT (path_denied);
… …
1382 CMP_OUT (move_slow); 1387 CMP_OUT (move_slow);
1383 CMP_OUT (move_slow_penalty); 1388 CMP_OUT (move_slow_penalty);
1384 1389
1385 if (op->flag != tmp->flag) 1390 if (op->flag != tmp->flag)
1386 for (i = 0; i <= NUM_FLAGS; i++) 1391 for (i = 0; i <= NUM_FLAGS; i++)
1387 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1392 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1388 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1393 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1389 1394
1390 // save body locations 1395 // save body locations
1391 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1392 if (op->slot[i].info != tmp->slot[i].info) 1397 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1393 f.put (body_locations[i].save_name, op->slot[i].info); 1398 f.put (body_locations[i].save_name, op->slot[i].info);
1394} 1399}
1395 1400
1396/* 1401/*
1397 * Dumps all variables in an object to a file. 1402 * Dumps all variables in an object to a file.
… …
1399 * the only place this is not set is when saving the player. 1404 * the only place this is not set is when saving the player.
1400 */ 1405 */
1401bool 1406bool
1402object::write (object_freezer &f) 1407object::write (object_freezer &f)
1403{ 1408{
1404 /* Even if the object does have an owner, it would seem that we should
1405 * still save it.
1406 */
1407 if (owner)
1408 return true;
1409
1410 archetype *at = arch ? (archetype *)arch : empty_archetype; 1409 archetype *at = arch ? (archetype *)arch : empty_archetype;
1411 1410
1412 f.put (KW_arch, at->archname); 1411 f.put (KW_arch, at->archname);
1413 write_diff (f, this, at); 1412 write_diff (f, this, at);
1414 1413
… …
1430 object_thawer f (filename); 1429 object_thawer f (filename);
1431 1430
1432 bool success = false; 1431 bool success = false;
1433 bool seen_arch = false; 1432 bool seen_arch = false;
1434 1433
1435 f.next ();
1436
1437 for (;;) 1434 for (;;)
1438 { 1435 {
1439 switch (f.kw) 1436 switch (f.kw)
1440 { 1437 {
1441 case KW_region: 1438 case KW_region:

Diff Legend

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