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.101 by root, Tue Sep 4 18:20:35 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 */
… …
601 601
602 if (!other_arch) 602 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
604 break; 604 break;
605 605
606 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ());
608 break;
609
606 case KW_animation: 610 case KW_animation:
607 { 611 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 612 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 613 animation_id = 0;
610 614
… …
640 break; 644 break;
641 645
642 case KW_sound: 646 case KW_sound:
643 sound = sound_find (f.get_str ()); 647 sound = sound_find (f.get_str ());
644 if (!sound) 648 if (!sound)
645 sound = face_find (f.get_str ());//TODO: really fall back to face name? 649 f.parse_warn ("sound not found");
650 break;
651
652 case KW_sound_destroy:
653 sound_destroy = sound_find (f.get_str ());
654 if (!sound_destroy)
655 f.parse_warn ("sound not found");
646 break; 656 break;
647 657
648 case KW_x: f.get (x); break; 658 case KW_x: f.get (x); break;
649 case KW_y: f.get (y); break; 659 case KW_y: f.get (y); break;
650 660
… …
1041int 1051int
1042set_variable (object *op, char *buf) 1052set_variable (object *op, char *buf)
1043{ 1053{
1044 object_thawer f (buf, (AV *)0); 1054 object_thawer f (buf, (AV *)0);
1045 1055
1046 f.next ();
1047 return op->parse_kv (f); 1056 return op->parse_kv (f);
1048} 1057}
1049 1058
1050/* This returns a string of the integer movement type */ 1059/* This returns a string of the integer movement type */
1051#if 0 1060#if 0
… …
1263 char uids[64]; 1272 char uids[64];
1264 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1265 f.put (KW_uuid, (const char *)uids); 1274 f.put (KW_uuid, (const char *)uids);
1266 } 1275 }
1267 1276
1268#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1277#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) 1278#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1279
1280 if (object *owner = op->owner)
1281 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1270 1282
1271 CMP_OUT (name); 1283 CMP_OUT (name);
1272 CMP_OUT (name_pl); 1284 CMP_OUT (name_pl);
1273 CMP_OUT (custom_name); 1285 CMP_OUT (custom_name);
1274 CMP_OUT (title); 1286 CMP_OUT (title);
… …
1277 CMP_OUT (other_arch); 1289 CMP_OUT (other_arch);
1278 1290
1279 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1291 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); 1292 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1281 1293
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); 1294 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1295 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1296 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1284 1297
1285 if (op->animation_id != tmp->animation_id) 1298 if (op->animation_id != tmp->animation_id)
1286 if (op->animation_id) 1299 if (op->animation_id)
1287 { 1300 {
1288 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1301 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1330 CMP_OUT (type); 1343 CMP_OUT (type);
1331 CMP_OUT (subtype); 1344 CMP_OUT (subtype);
1332 CMP_OUT (attacktype); 1345 CMP_OUT (attacktype);
1333 1346
1334 for (i = 0; i < NROFATTACKS; i++) 1347 for (i = 0; i < NROFATTACKS; i++)
1335 if (op->resist[i] != tmp->resist[i]) 1348 if (expect_false (op->resist[i] != tmp->resist[i]))
1336 f.put (resist_save[i], op->resist[i]); 1349 f.put (resist_save[i], op->resist[i]);
1337 1350
1338 CMP_OUT (path_attuned); 1351 CMP_OUT (path_attuned);
1339 CMP_OUT (path_repelled); 1352 CMP_OUT (path_repelled);
1340 CMP_OUT (path_denied); 1353 CMP_OUT (path_denied);
… …
1382 CMP_OUT (move_slow); 1395 CMP_OUT (move_slow);
1383 CMP_OUT (move_slow_penalty); 1396 CMP_OUT (move_slow_penalty);
1384 1397
1385 if (op->flag != tmp->flag) 1398 if (op->flag != tmp->flag)
1386 for (i = 0; i <= NUM_FLAGS; i++) 1399 for (i = 0; i <= NUM_FLAGS; i++)
1387 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1400 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1388 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1401 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1389 1402
1390 // save body locations 1403 // save body locations
1391 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1404 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1392 if (op->slot[i].info != tmp->slot[i].info) 1405 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1393 f.put (body_locations[i].save_name, op->slot[i].info); 1406 f.put (body_locations[i].save_name, op->slot[i].info);
1394} 1407}
1395 1408
1396/* 1409/*
1397 * Dumps all variables in an object to a file. 1410 * Dumps all variables in an object to a file.
… …
1399 * the only place this is not set is when saving the player. 1412 * the only place this is not set is when saving the player.
1400 */ 1413 */
1401bool 1414bool
1402object::write (object_freezer &f) 1415object::write (object_freezer &f)
1403{ 1416{
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; 1417 archetype *at = arch ? (archetype *)arch : empty_archetype;
1411 1418
1412 f.put (KW_arch, at->archname); 1419 f.put (KW_arch, at->archname);
1413 write_diff (f, this, at); 1420 write_diff (f, this, at);
1414 1421
… …
1430 object_thawer f (filename); 1437 object_thawer f (filename);
1431 1438
1432 bool success = false; 1439 bool success = false;
1433 bool seen_arch = false; 1440 bool seen_arch = false;
1434 1441
1435 f.next ();
1436
1437 for (;;) 1442 for (;;)
1438 { 1443 {
1439 switch (f.kw) 1444 switch (f.kw)
1440 { 1445 {
1441 case KW_region: 1446 case KW_region:

Diff Legend

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