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.94 by root, Tue Jul 31 20:03:33 2007 UTC vs.
Revision 1.102 by root, Mon Sep 10 12:44:06 2007 UTC

… …
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
… …
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 */
… …
556 556
557 case KW_attach: f.get_ornull (attach); break; 557 case KW_attach: f.get_ornull (attach); break;
558 case KW_skill: f.get_ornull (skill); break; 558 case KW_skill: f.get_ornull (skill); break;
559 case KW_race: f.get_ornull (race); break; 559 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 560 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break;
561 562
562 case KW_arch: 563 case KW_arch:
563 { 564 {
564 object *tmp = object::read (f); 565 object *tmp = object::read (f);
565 tmp->deactivate (); 566 tmp->deactivate ();
… …
601 602
602 if (!other_arch) 603 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 604 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
604 break; 605 break;
605 606
607 case KW_owner:
608 f.delayed_deref (this, owner, f.get_str ());
609 break;
610
606 case KW_animation: 611 case KW_animation:
607 { 612 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 613 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 614 animation_id = 0;
610 615
… …
640 break; 645 break;
641 646
642 case KW_sound: 647 case KW_sound:
643 sound = sound_find (f.get_str ()); 648 sound = sound_find (f.get_str ());
644 if (!sound) 649 if (!sound)
645 { 650 f.parse_warn ("sound not found");
646 //TODO: really fall back to face name? 651 break;
647 char face[128]; 652
648 snprintf (face, 128, "sound/%s", f.get_str ()); 653 case KW_sound_destroy:
649 sound = face_find (face); 654 sound_destroy = sound_find (f.get_str ());
650 } 655 if (!sound_destroy)
656 f.parse_warn ("sound not found");
651 break; 657 break;
652 658
653 case KW_x: f.get (x); break; 659 case KW_x: f.get (x); break;
654 case KW_y: f.get (y); break; 660 case KW_y: f.get (y); break;
655 661
… …
1046int 1052int
1047set_variable (object *op, char *buf) 1053set_variable (object *op, char *buf)
1048{ 1054{
1049 object_thawer f (buf, (AV *)0); 1055 object_thawer f (buf, (AV *)0);
1050 1056
1051 f.next ();
1052 return op->parse_kv (f); 1057 return op->parse_kv (f);
1053} 1058}
1054 1059
1055/* This returns a string of the integer movement type */ 1060/* This returns a string of the integer movement type */
1056#if 0 1061#if 0
… …
1268 char uids[64]; 1273 char uids[64];
1269 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1274 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1270 f.put (KW_uuid, (const char *)uids); 1275 f.put (KW_uuid, (const char *)uids);
1271 } 1276 }
1272 1277
1273#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1278#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1274#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1279#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1280
1281 if (object *owner = op->owner)
1282 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1275 1283
1276 CMP_OUT (name); 1284 CMP_OUT (name);
1277 CMP_OUT (name_pl); 1285 CMP_OUT (name_pl);
1278 CMP_OUT (custom_name); 1286 CMP_OUT (custom_name);
1279 CMP_OUT (title); 1287 CMP_OUT (title);
1280 CMP_OUT (race); 1288 CMP_OUT (race);
1281 CMP_OUT (slaying); 1289 CMP_OUT (slaying);
1290 CMP_OUT (tag);
1282 CMP_OUT (other_arch); 1291 CMP_OUT (other_arch);
1283 1292
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1293 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1285 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1294 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1286 1295
1287 if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0);
1288 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1296 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1297 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1298 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1299
1290 if (op->animation_id != tmp->animation_id) 1300 if (op->animation_id != tmp->animation_id)
1291 if (op->animation_id) 1301 if (op->animation_id)
1292 { 1302 {
1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1303 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1335 CMP_OUT (type); 1345 CMP_OUT (type);
1336 CMP_OUT (subtype); 1346 CMP_OUT (subtype);
1337 CMP_OUT (attacktype); 1347 CMP_OUT (attacktype);
1338 1348
1339 for (i = 0; i < NROFATTACKS; i++) 1349 for (i = 0; i < NROFATTACKS; i++)
1340 if (op->resist[i] != tmp->resist[i]) 1350 if (expect_false (op->resist[i] != tmp->resist[i]))
1341 f.put (resist_save[i], op->resist[i]); 1351 f.put (resist_save[i], op->resist[i]);
1342 1352
1343 CMP_OUT (path_attuned); 1353 CMP_OUT (path_attuned);
1344 CMP_OUT (path_repelled); 1354 CMP_OUT (path_repelled);
1345 CMP_OUT (path_denied); 1355 CMP_OUT (path_denied);
… …
1387 CMP_OUT (move_slow); 1397 CMP_OUT (move_slow);
1388 CMP_OUT (move_slow_penalty); 1398 CMP_OUT (move_slow_penalty);
1389 1399
1390 if (op->flag != tmp->flag) 1400 if (op->flag != tmp->flag)
1391 for (i = 0; i <= NUM_FLAGS; i++) 1401 for (i = 0; i <= NUM_FLAGS; i++)
1392 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1402 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1393 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1403 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1394 1404
1395 // save body locations 1405 // save body locations
1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1406 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1397 if (op->slot[i].info != tmp->slot[i].info) 1407 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1398 f.put (body_locations[i].save_name, op->slot[i].info); 1408 f.put (body_locations[i].save_name, op->slot[i].info);
1399} 1409}
1400 1410
1401/* 1411/*
1402 * Dumps all variables in an object to a file. 1412 * Dumps all variables in an object to a file.
… …
1404 * the only place this is not set is when saving the player. 1414 * the only place this is not set is when saving the player.
1405 */ 1415 */
1406bool 1416bool
1407object::write (object_freezer &f) 1417object::write (object_freezer &f)
1408{ 1418{
1409 /* Even if the object does have an owner, it would seem that we should
1410 * still save it.
1411 */
1412 if (owner)
1413 return true;
1414
1415 archetype *at = arch ? (archetype *)arch : empty_archetype; 1419 archetype *at = arch ? (archetype *)arch : empty_archetype;
1416 1420
1417 f.put (KW_arch, at->archname); 1421 f.put (KW_arch, at->archname);
1418 write_diff (f, this, at); 1422 write_diff (f, this, at);
1419 1423
… …
1435 object_thawer f (filename); 1439 object_thawer f (filename);
1436 1440
1437 bool success = false; 1441 bool success = false;
1438 bool seen_arch = false; 1442 bool seen_arch = false;
1439 1443
1440 f.next ();
1441
1442 for (;;) 1444 for (;;)
1443 { 1445 {
1444 switch (f.kw) 1446 switch (f.kw)
1445 { 1447 {
1446 case KW_region: 1448 case KW_region:

Diff Legend

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