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.83 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.107 by root, Fri Apr 11 14:09:56 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
29#include <global.h> 28#include <global.h>
30#include <loader.h> 29#include <loader.h>
31#include <sproto.h> 30#include <sproto.h>
32 31
33///////////////////////////////////////////////////////////////////////////// 32/////////////////////////////////////////////////////////////////////////////
33
34extern archetype *loading_arch;
34 35
35/* 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
36 * spell object conversion to the new object. It was not practical 37 * spell object conversion to the new object. It was not practical
37 * 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
38 * 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
… …
168 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 251 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 252 "spell_glyph", /* 205 */
252 NULL 253 NULL
253}; 254};
254 255
255extern bool loading_arch;
256
257/* 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
258 * 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
259 * 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
260 * 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.
261 */ 260 */
… …
325 * also have to catch is if this object is not using the normal name for 324 * also have to catch is if this object is not using the normal name for
326 * the object. In that case, we also want to use the loaded name. 325 * the object. In that case, we also want to use the loaded name.
327 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 328 */
330 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
331 name_pl = 0; 330 name_pl = 0;
332 331
333 if (!name_pl) 332 if (!name_pl)
334 name_pl = name; 333 name_pl = name;
335 334
… …
384 * something that has item_power 1 is probably just fine if our calculated 383 * something that has item_power 1 is probably just fine if our calculated
385 * value is 1 or 2 - these values are small enough that hard to be precise. 384 * value is 1 or 2 - these values are small enough that hard to be precise.
386 * similarly, it item_power is 0, the first check will always pass, 385 * similarly, it item_power is 0, the first check will always pass,
387 * but not the second one. 386 * but not the second one.
388 */ 387 */
388#if 0 //TODO
389 if (ip > 2 * item_power && ip > (item_power + 3)) 389 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif
391 } 392 }
392 393
393 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
394 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
395 /* 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 */
396 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
397 { 398 {
398 /* 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'
399 * in that spell was stored in sp. 400 * in that spell was stored in sp.
400 */ 401 */
401 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]);
402 insert_ob_in_ob (tmp, this); 403 insert_ob_in_ob (tmp, this);
403 randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
… …
408 { 409 {
409 object *tmp = get_archetype_by_object_name (slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
410 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
411 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
412 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
413 value = arch->clone.value * inv->value; 414 value = arch->value * inv->value;
414 } 415 }
415 416
416 if (QUERY_FLAG (this, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
417 { 418 {
418 if (stats.hp > stats.maxhp) 419 if (stats.hp > stats.maxhp)
… …
515 516
516next: ; 517next: ;
517 } 518 }
518} 519}
519 520
520#define GET_FLAG(op,flag) \ 521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
521 if (f.get_sint32 ()) \
522 SET_FLAG (op, flag); \
523 else \
524 CLEAR_FLAG (op, flag) \
525 522
526bool 523bool
527object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
528{ 525{
529 object *op_inv = inv; 526 object *op_inv = inv;
… …
532 { 529 {
533 switch (f.kw) 530 switch (f.kw)
534 { 531 {
535 case KW_uuid: 532 case KW_uuid:
536 if (const char *s = f.get_str ()) 533 if (const char *s = f.get_str ())
537 { 534 if (!uuid.parse (s))
538 unsigned int version;
539 unsigned long long seq;
540
541 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
542 { 535 {
543 uuid.seq = seq; 536 f.parse_warn ("unparseable uuid");
544 break; 537 uuid = UUID::gen ();
545 } 538 }
546 }
547
548 uuid = gen_uuid ();
549 break; 539 break;
550 540
551 case KW_oid: 541 case KW_oid:
552 f.get (this, f.get_sint32 ()); 542 f.get (this, f.get_sint32 ());
553 break; 543 break;
… …
559 549
560 case KW_attach: f.get_ornull (attach); break; 550 case KW_attach: f.get_ornull (attach); break;
561 case KW_skill: f.get_ornull (skill); break; 551 case KW_skill: f.get_ornull (skill); break;
562 case KW_race: f.get_ornull (race); break; 552 case KW_race: f.get_ornull (race); break;
563 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;
564 555
565 case KW_arch: 556 case KW_arch:
566 { 557 {
567 object *tmp = object::read (f); 558 object *tmp = object::read (f);
568 tmp->deactivate (); 559 tmp->deactivate ();
… …
570 { 561 {
571 // was: insert_ob_in_ob (tmp, op); 562 // was: insert_ob_in_ob (tmp, op);
572 // but manually adding it can improve map loading times a lot 563 // but manually adding it can improve map loading times a lot
573 // also, appending instead of prepending keeps the 564 // also, appending instead of prepending keeps the
574 // 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
575 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 567 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
576 CLEAR_FLAG (tmp, FLAG_REMOVED); 568 CLEAR_FLAG (tmp, FLAG_REMOVED);
577 569
578 if (!op_inv) 570 if (!op_inv)
579 { 571 {
… …
601 loading_arch 593 loading_arch
602 ? archetype::get (f.get_str ()) 594 ? archetype::get (f.get_str ())
603 : archetype::find (f.get_str ()); 595 : archetype::find (f.get_str ());
604 596
605 if (!other_arch) 597 if (!other_arch)
606 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 ());
607 break; 603 break;
608 604
609 case KW_animation: 605 case KW_animation:
610 { 606 {
611 CLEAR_FLAG (this, FLAG_ANIMATE); 607 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
638 f.get (move_slow_penalty); 634 f.get (move_slow_penalty);
639 break; 635 break;
640 636
641 case KW_face: 637 case KW_face:
642 face = face_find (f.get_str ()); 638 face = face_find (f.get_str ());
639 break;
640
641 case KW_sound:
642 sound = sound_find (f.get_str ());
643 if (!sound)
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");
643 break; 651 break;
644 652
645 case KW_x: f.get (x); break; 653 case KW_x: f.get (x); break;
646 case KW_y: f.get (y); break; 654 case KW_y: f.get (y); break;
647 655
… …
775 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 783 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
776 784
777 break; 785 break;
778 786
779 case KW_friendly: 787 case KW_friendly:
780 if (f.get_sint32 ()) 788 if (f.get_bool ())
781 if (type != PLAYER) 789 if (type != PLAYER)
782 add_friendly_object (this); 790 add_friendly_object (this);
783 791
784 break; 792 break;
785 793
… …
961 randomitems = 0; 969 randomitems = 0;
962 break; 970 break;
963 971
964 case KW_msg: 972 case KW_msg:
965 f.get_ml (KW_endmsg, msg); 973 f.get_ml (KW_endmsg, msg);
966 //TODO: allow longer messages
967 if (strlen (msg) >= HUGE_BUF)
968 {
969 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
970 msg = "ERROR, please report: string too long, winged.\n";
971 }
972 break; 974 break;
973 975
974 case KW_lore: 976 case KW_lore:
975 f.get_ml (KW_endlore, lore); 977 f.get_ml (KW_endlore, lore);
976 //TODO: allow longer messages
977 /* Just print a warning so we can be reasonably safe
978 * about not overflowing the buffer.
979 */
980 if (strlen (lore) > (HUGE_BUF / 2))
981 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
982 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
983 break; 978 break;
984 979
985 case KW_editable: 980 case KW_editable:
986 case KW_editor_folder: 981 case KW_editor_folder:
987 break; 982 break;
… …
1026 f.next (); 1021 f.next ();
1027 1022
1028 object *op = object::create (); 1023 object *op = object::create ();
1029 1024
1030 op->map = map; 1025 op->map = map;
1031 arch->clone.copy_to (op); 1026 arch->copy_to (op);
1032 // copy_to activates, this should be fixed properly 1027 // copy_to activates, this should be fixed properly
1033 op->deactivate (); 1028 op->deactivate ();
1034 1029
1035 if (!op->parse_kv (f)) 1030 if (!op->parse_kv (f))
1036 { 1031 {
… …
1051int 1046int
1052set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1053{ 1048{
1054 object_thawer f (buf, (AV *)0); 1049 object_thawer f (buf, (AV *)0);
1055 1050
1056 f.next ();
1057 return op->parse_kv (f); 1051 return op->parse_kv (f);
1058} 1052}
1059 1053
1060/* This returns a string of the integer movement type */ 1054/* This returns a string of the integer movement type */
1061#if 0 1055#if 0
… …
1267 1261
1268 /* 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
1269 * will get taken care of the copy_to method. 1263 * will get taken care of the copy_to method.
1270 */ 1264 */
1271 1265
1272 { 1266 f.put (KW_uuid, op->uuid.c_str ());
1273 char uids[64];
1274 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1275 f.put (KW_uuid, (const char *)uids);
1276 }
1277 1267
1278#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)
1279#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 ()));
1280 1273
1281 CMP_OUT (name); 1274 CMP_OUT (name);
1282 CMP_OUT (name_pl); 1275 CMP_OUT (name_pl);
1283 CMP_OUT (custom_name); 1276 CMP_OUT (custom_name);
1284 CMP_OUT (title); 1277 CMP_OUT (title);
1285 CMP_OUT (race); 1278 CMP_OUT (race);
1286 CMP_OUT (slaying); 1279 CMP_OUT (slaying);
1287 1280 CMP_OUT (tag);
1288 if (op->msg != tmp->msg)
1289 f.put (KW_msg, KW_endmsg, op->msg);
1290 if (op->lore != tmp->lore)
1291 f.put (KW_lore, KW_endlore, op->lore);
1292
1293 CMP_OUT (other_arch); 1281 CMP_OUT (other_arch);
1294 1282
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1285
1295 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);
1296 1289
1297 if (op->animation_id != tmp->animation_id) 1290 if (op->animation_id != tmp->animation_id)
1298 if (op->animation_id) 1291 if (op->animation_id)
1299 { 1292 {
1300 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1301 1294
1302 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1295 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1303 f.put (KW_is_animated, (sint32) 0); 1296 f.put (KW_is_animated, (sint32)0);
1304 } 1297 }
1305 else 1298 else
1306 f.put (KW_animation, (const char *) 0); 1299 f.put (KW_animation, (const char *)0);
1307 1300
1308 CMP_OUT2 (str, stats.Str); 1301 CMP_OUT2 (str, stats.Str);
1309 CMP_OUT2 (dex, stats.Dex); 1302 CMP_OUT2 (dex, stats.Dex);
1310 CMP_OUT2 (con, stats.Con); 1303 CMP_OUT2 (con, stats.Con);
1311 CMP_OUT2 (wis, stats.Wis); 1304 CMP_OUT2 (wis, stats.Wis);
… …
1342 CMP_OUT (type); 1335 CMP_OUT (type);
1343 CMP_OUT (subtype); 1336 CMP_OUT (subtype);
1344 CMP_OUT (attacktype); 1337 CMP_OUT (attacktype);
1345 1338
1346 for (i = 0; i < NROFATTACKS; i++) 1339 for (i = 0; i < NROFATTACKS; i++)
1347 if (op->resist[i] != tmp->resist[i]) 1340 if (expect_false (op->resist[i] != tmp->resist[i]))
1348 f.put (resist_save[i], op->resist[i]); 1341 f.put (resist_save[i], op->resist[i]);
1349 1342
1350 CMP_OUT (path_attuned); 1343 CMP_OUT (path_attuned);
1351 CMP_OUT (path_repelled); 1344 CMP_OUT (path_repelled);
1352 CMP_OUT (path_denied); 1345 CMP_OUT (path_denied);
… …
1394 CMP_OUT (move_slow); 1387 CMP_OUT (move_slow);
1395 CMP_OUT (move_slow_penalty); 1388 CMP_OUT (move_slow_penalty);
1396 1389
1397 if (op->flag != tmp->flag) 1390 if (op->flag != tmp->flag)
1398 for (i = 0; i <= NUM_FLAGS; i++) 1391 for (i = 0; i <= NUM_FLAGS; i++)
1399 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1392 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1400 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1393 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1401 1394
1402 // save body locations 1395 // save body locations
1403 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1404 if (op->slot[i].info != tmp->slot[i].info) 1397 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1405 f.put (body_locations[i].save_name, op->slot[i].info); 1398 f.put (body_locations[i].save_name, op->slot[i].info);
1406} 1399}
1407 1400
1408/* 1401/*
1409 * Dumps all variables in an object to a file. 1402 * Dumps all variables in an object to a file.
… …
1411 * 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.
1412 */ 1405 */
1413bool 1406bool
1414object::write (object_freezer &f) 1407object::write (object_freezer &f)
1415{ 1408{
1416 /* Even if the object does have an owner, it would seem that we should
1417 * still save it.
1418 */
1419 if (owner)
1420 return true;
1421
1422 archetype *at = arch ? (archetype *)arch : empty_archetype; 1409 archetype *at = arch ? (archetype *)arch : empty_archetype;
1423 1410
1424 f.put (KW_arch, at->name); 1411 f.put (KW_arch, at->archname);
1425 write_diff (f, this, &at->clone); 1412 write_diff (f, this, at);
1426 1413
1427 for (object *tmp = inv; tmp; tmp = tmp->below) 1414 for (object *tmp = inv; tmp; tmp = tmp->below)
1428 tmp->write (f); 1415 tmp->write (f);
1429 1416
1430 f.put (this); 1417 f.put (this);
… …
1442 object_thawer f (filename); 1429 object_thawer f (filename);
1443 1430
1444 bool success = false; 1431 bool success = false;
1445 bool seen_arch = false; 1432 bool seen_arch = false;
1446 1433
1447 f.next ();
1448
1449 for (;;) 1434 for (;;)
1450 { 1435 {
1451 switch (f.kw) 1436 switch (f.kw)
1452 { 1437 {
1453 case KW_region: 1438 case KW_region:

Diff Legend

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