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.92 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.104 by elmex, Thu Nov 8 12:10:47 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
… …
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 */
… …
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 ();
… …
567 { 568 {
568 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
569 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
570 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
571 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects
572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
573 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
574 576
575 if (!op_inv) 577 if (!op_inv)
576 { 578 {
… …
601 603
602 if (!other_arch) 604 if (!other_arch)
603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
604 break; 606 break;
605 607
608 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ());
610 break;
611
606 case KW_animation: 612 case KW_animation:
607 { 613 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 614 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 615 animation_id = 0;
610 616
… …
635 f.get (move_slow_penalty); 641 f.get (move_slow_penalty);
636 break; 642 break;
637 643
638 case KW_face: 644 case KW_face:
639 face = face_find (f.get_str ()); 645 face = face_find (f.get_str ());
646 break;
647
648 case KW_sound:
649 sound = sound_find (f.get_str ());
650 if (!sound)
651 f.parse_warn ("sound not found");
652 break;
653
654 case KW_sound_destroy:
655 sound_destroy = sound_find (f.get_str ());
656 if (!sound_destroy)
657 f.parse_warn ("sound not found");
640 break; 658 break;
641 659
642 case KW_x: f.get (x); break; 660 case KW_x: f.get (x); break;
643 case KW_y: f.get (y); break; 661 case KW_y: f.get (y); break;
644 662
… …
1035int 1053int
1036set_variable (object *op, char *buf) 1054set_variable (object *op, char *buf)
1037{ 1055{
1038 object_thawer f (buf, (AV *)0); 1056 object_thawer f (buf, (AV *)0);
1039 1057
1040 f.next ();
1041 return op->parse_kv (f); 1058 return op->parse_kv (f);
1042} 1059}
1043 1060
1044/* This returns a string of the integer movement type */ 1061/* This returns a string of the integer movement type */
1045#if 0 1062#if 0
… …
1257 char uids[64]; 1274 char uids[64];
1258 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1259 f.put (KW_uuid, (const char *)uids); 1276 f.put (KW_uuid, (const char *)uids);
1260 } 1277 }
1261 1278
1262#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1279#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1263#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1280#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1281
1282 if (object *owner = op->owner)
1283 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1264 1284
1265 CMP_OUT (name); 1285 CMP_OUT (name);
1266 CMP_OUT (name_pl); 1286 CMP_OUT (name_pl);
1267 CMP_OUT (custom_name); 1287 CMP_OUT (custom_name);
1268 CMP_OUT (title); 1288 CMP_OUT (title);
1269 CMP_OUT (race); 1289 CMP_OUT (race);
1270 CMP_OUT (slaying); 1290 CMP_OUT (slaying);
1271 1291 CMP_OUT (tag);
1272 if (op->msg != tmp->msg)
1273 f.put (KW_msg, KW_endmsg, op->msg);
1274 if (op->lore != tmp->lore)
1275 f.put (KW_lore, KW_endlore, op->lore);
1276
1277 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1278 1293
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1295 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1296
1279 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1280 1300
1281 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != tmp->animation_id)
1282 if (op->animation_id) 1302 if (op->animation_id)
1283 { 1303 {
1284 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1326 CMP_OUT (type); 1346 CMP_OUT (type);
1327 CMP_OUT (subtype); 1347 CMP_OUT (subtype);
1328 CMP_OUT (attacktype); 1348 CMP_OUT (attacktype);
1329 1349
1330 for (i = 0; i < NROFATTACKS; i++) 1350 for (i = 0; i < NROFATTACKS; i++)
1331 if (op->resist[i] != tmp->resist[i]) 1351 if (expect_false (op->resist[i] != tmp->resist[i]))
1332 f.put (resist_save[i], op->resist[i]); 1352 f.put (resist_save[i], op->resist[i]);
1333 1353
1334 CMP_OUT (path_attuned); 1354 CMP_OUT (path_attuned);
1335 CMP_OUT (path_repelled); 1355 CMP_OUT (path_repelled);
1336 CMP_OUT (path_denied); 1356 CMP_OUT (path_denied);
… …
1378 CMP_OUT (move_slow); 1398 CMP_OUT (move_slow);
1379 CMP_OUT (move_slow_penalty); 1399 CMP_OUT (move_slow_penalty);
1380 1400
1381 if (op->flag != tmp->flag) 1401 if (op->flag != tmp->flag)
1382 for (i = 0; i <= NUM_FLAGS; i++) 1402 for (i = 0; i <= NUM_FLAGS; i++)
1383 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1384 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1404 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1385 1405
1386 // save body locations 1406 // save body locations
1387 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1388 if (op->slot[i].info != tmp->slot[i].info) 1408 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1389 f.put (body_locations[i].save_name, op->slot[i].info); 1409 f.put (body_locations[i].save_name, op->slot[i].info);
1390} 1410}
1391 1411
1392/* 1412/*
1393 * Dumps all variables in an object to a file. 1413 * Dumps all variables in an object to a file.
… …
1395 * the only place this is not set is when saving the player. 1415 * the only place this is not set is when saving the player.
1396 */ 1416 */
1397bool 1417bool
1398object::write (object_freezer &f) 1418object::write (object_freezer &f)
1399{ 1419{
1400 /* Even if the object does have an owner, it would seem that we should
1401 * still save it.
1402 */
1403 if (owner)
1404 return true;
1405
1406 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1407 1421
1408 f.put (KW_arch, at->archname); 1422 f.put (KW_arch, at->archname);
1409 write_diff (f, this, at); 1423 write_diff (f, this, at);
1410 1424
… …
1426 object_thawer f (filename); 1440 object_thawer f (filename);
1427 1441
1428 bool success = false; 1442 bool success = false;
1429 bool seen_arch = false; 1443 bool seen_arch = false;
1430 1444
1431 f.next ();
1432
1433 for (;;) 1445 for (;;)
1434 { 1446 {
1435 switch (f.kw) 1447 switch (f.kw)
1436 { 1448 {
1437 case KW_region: 1449 case KW_region:

Diff Legend

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