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.82 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.105 by root, Thu Nov 8 19:43:23 2007 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 */
262void 261void
263object::post_load_check () 262object::post_load_check ()
264{ 263{
264 if (type >= NUM_TYPES)
265 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0;
268 }
269
265 switch (type) 270 switch (type)
266 { 271 {
267 case BOW: 272 case BOW:
268 case WAND: 273 case WAND:
269 case ROD: 274 case ROD:
… …
319 * 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
320 * 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.
321 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
322 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
323 */ 328 */
324 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)
325 name_pl = 0; 330 name_pl = 0;
326 331
327 if (!name_pl) 332 if (!name_pl)
328 name_pl = name; 333 name_pl = name;
329 334
… …
378 * 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
379 * 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.
380 * 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,
381 * but not the second one. 386 * but not the second one.
382 */ 387 */
388#if 0 //TODO
383 if (ip > 2 * item_power && ip > (item_power + 3)) 389 if (ip > 2 * item_power && ip > (item_power + 3))
384 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
385 } 392 }
386 393
387 /* Old spellcasting object - need to load in the appropiate object */ 394 /* Old spellcasting object - need to load in the appropiate object */
388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
389 /* 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 */
390 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
391 { 398 {
392 /* 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'
393 * in that spell was stored in sp. 400 * in that spell was stored in sp.
394 */ 401 */
395 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]);
396 insert_ob_in_ob (tmp, this); 403 insert_ob_in_ob (tmp, this);
397 randomitems = NULL; /* So another spell isn't created for this object */ 404 randomitems = NULL; /* So another spell isn't created for this object */
… …
402 { 409 {
403 object *tmp = get_archetype_by_object_name (slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
404 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
406 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
407 value = arch->clone.value * inv->value; 414 value = arch->value * inv->value;
408 } 415 }
409 416
410 if (QUERY_FLAG (this, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
411 { 418 {
412 if (stats.hp > stats.maxhp) 419 if (stats.hp > stats.maxhp)
… …
509 516
510next: ; 517next: ;
511 } 518 }
512} 519}
513 520
514#define GET_FLAG(op,flag) \ 521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
515 if (f.get_sint32 ()) \
516 SET_FLAG (op, flag); \
517 else \
518 CLEAR_FLAG (op, flag) \
519 522
520bool 523bool
521object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
522{ 525{
523 object *op_inv = inv; 526 object *op_inv = inv;
… …
553 556
554 case KW_attach: f.get_ornull (attach); break; 557 case KW_attach: f.get_ornull (attach); break;
555 case KW_skill: f.get_ornull (skill); break; 558 case KW_skill: f.get_ornull (skill); break;
556 case KW_race: f.get_ornull (race); break; 559 case KW_race: f.get_ornull (race); break;
557 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;
558 562
559 case KW_arch: 563 case KW_arch:
560 { 564 {
561 object *tmp = object::read (f); 565 object *tmp = object::read (f);
562 tmp->deactivate (); 566 tmp->deactivate ();
… …
564 { 568 {
565 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
566 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
567 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
568 // 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
569 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
570 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
571 576
572 if (!op_inv) 577 if (!op_inv)
573 { 578 {
… …
598 603
599 if (!other_arch) 604 if (!other_arch)
600 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 ());
601 break; 606 break;
602 607
608 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ());
610 break;
611
603 case KW_animation: 612 case KW_animation:
604 { 613 {
605 CLEAR_FLAG (this, FLAG_ANIMATE); 614 CLEAR_FLAG (this, FLAG_ANIMATE);
606 animation_id = 0; 615 animation_id = 0;
607 616
… …
632 f.get (move_slow_penalty); 641 f.get (move_slow_penalty);
633 break; 642 break;
634 643
635 case KW_face: 644 case KW_face:
636 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");
637 break; 658 break;
638 659
639 case KW_x: f.get (x); break; 660 case KW_x: f.get (x); break;
640 case KW_y: f.get (y); break; 661 case KW_y: f.get (y); break;
641 662
… …
769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 790 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
770 791
771 break; 792 break;
772 793
773 case KW_friendly: 794 case KW_friendly:
774 if (f.get_sint32 ()) 795 if (f.get_bool ())
775 if (type != PLAYER) 796 if (type != PLAYER)
776 add_friendly_object (this); 797 add_friendly_object (this);
777 798
778 break; 799 break;
779 800
… …
955 randomitems = 0; 976 randomitems = 0;
956 break; 977 break;
957 978
958 case KW_msg: 979 case KW_msg:
959 f.get_ml (KW_endmsg, msg); 980 f.get_ml (KW_endmsg, msg);
960 //TODO: allow longer messages
961 if (strlen (msg) >= HUGE_BUF)
962 {
963 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
964 msg = "ERROR, please report: string too long, winged.\n";
965 }
966 break; 981 break;
967 982
968 case KW_lore: 983 case KW_lore:
969 f.get_ml (KW_endlore, lore); 984 f.get_ml (KW_endlore, lore);
970 //TODO: allow longer messages
971 /* Just print a warning so we can be reasonably safe
972 * about not overflowing the buffer.
973 */
974 if (strlen (lore) > (HUGE_BUF / 2))
975 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
976 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
977 break; 985 break;
978 986
979 case KW_editable: 987 case KW_editable:
980 case KW_editor_folder: 988 case KW_editor_folder:
981 break; 989 break;
… …
1020 f.next (); 1028 f.next ();
1021 1029
1022 object *op = object::create (); 1030 object *op = object::create ();
1023 1031
1024 op->map = map; 1032 op->map = map;
1025 arch->clone.copy_to (op); 1033 arch->copy_to (op);
1026 // copy_to activates, this should be fixed properly 1034 // copy_to activates, this should be fixed properly
1027 op->deactivate (); 1035 op->deactivate ();
1028 1036
1029 if (!op->parse_kv (f)) 1037 if (!op->parse_kv (f))
1030 { 1038 {
… …
1045int 1053int
1046set_variable (object *op, char *buf) 1054set_variable (object *op, char *buf)
1047{ 1055{
1048 object_thawer f (buf, (AV *)0); 1056 object_thawer f (buf, (AV *)0);
1049 1057
1050 f.next ();
1051 return op->parse_kv (f); 1058 return op->parse_kv (f);
1052} 1059}
1053 1060
1054/* This returns a string of the integer movement type */ 1061/* This returns a string of the integer movement type */
1055#if 0 1062#if 0
… …
1267 char uids[64]; 1274 char uids[64];
1268 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);
1269 f.put (KW_uuid, (const char *)uids); 1276 f.put (KW_uuid, (const char *)uids);
1270 } 1277 }
1271 1278
1272#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)
1273#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 ()));
1274 1284
1275 CMP_OUT (name); 1285 CMP_OUT (name);
1276 CMP_OUT (name_pl); 1286 CMP_OUT (name_pl);
1277 CMP_OUT (custom_name); 1287 CMP_OUT (custom_name);
1278 CMP_OUT (title); 1288 CMP_OUT (title);
1279 CMP_OUT (race); 1289 CMP_OUT (race);
1280 CMP_OUT (slaying); 1290 CMP_OUT (slaying);
1281 1291 CMP_OUT (tag);
1282 if (op->msg != tmp->msg)
1283 f.put (KW_msg, KW_endmsg, op->msg);
1284 if (op->lore != tmp->lore)
1285 f.put (KW_lore, KW_endlore, op->lore);
1286
1287 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1288 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
1289 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);
1290 1300
1291 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1302 if (op->animation_id)
1293 { 1303 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1295 1305
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32) 0); 1307 f.put (KW_is_animated, (sint32)0);
1298 } 1308 }
1299 else 1309 else
1300 f.put (KW_animation, (const char *) 0); 1310 f.put (KW_animation, (const char *)0);
1301 1311
1302 CMP_OUT2 (str, stats.Str); 1312 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1313 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1314 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1315 CMP_OUT2 (wis, stats.Wis);
… …
1336 CMP_OUT (type); 1346 CMP_OUT (type);
1337 CMP_OUT (subtype); 1347 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1348 CMP_OUT (attacktype);
1339 1349
1340 for (i = 0; i < NROFATTACKS; i++) 1350 for (i = 0; i < NROFATTACKS; i++)
1341 if (op->resist[i] != tmp->resist[i]) 1351 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1352 f.put (resist_save[i], op->resist[i]);
1343 1353
1344 CMP_OUT (path_attuned); 1354 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1355 CMP_OUT (path_repelled);
1346 CMP_OUT (path_denied); 1356 CMP_OUT (path_denied);
… …
1388 CMP_OUT (move_slow); 1398 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1399 CMP_OUT (move_slow_penalty);
1390 1400
1391 if (op->flag != tmp->flag) 1401 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1402 for (i = 0; i <= NUM_FLAGS; i++)
1393 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1404 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1405
1396 // save body locations 1406 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (op->slot[i].info != tmp->slot[i].info) 1408 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1409 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1410}
1401 1411
1402/* 1412/*
1403 * Dumps all variables in an object to a file. 1413 * Dumps all variables in an object to a file.
… …
1405 * 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.
1406 */ 1416 */
1407bool 1417bool
1408object::write (object_freezer &f) 1418object::write (object_freezer &f)
1409{ 1419{
1410 /* Even if the object does have an owner, it would seem that we should
1411 * still save it.
1412 */
1413 if (owner)
1414 return true;
1415
1416 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1417 1421
1418 f.put (KW_arch, at->name); 1422 f.put (KW_arch, at->archname);
1419 write_diff (f, this, &at->clone); 1423 write_diff (f, this, at);
1420 1424
1421 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1422 tmp->write (f); 1426 tmp->write (f);
1423 1427
1424 f.put (this); 1428 f.put (this);
… …
1436 object_thawer f (filename); 1440 object_thawer f (filename);
1437 1441
1438 bool success = false; 1442 bool success = false;
1439 bool seen_arch = false; 1443 bool seen_arch = false;
1440 1444
1441 f.next ();
1442
1443 for (;;) 1445 for (;;)
1444 { 1446 {
1445 switch (f.kw) 1447 switch (f.kw)
1446 { 1448 {
1447 case KW_region: 1449 case KW_region:

Diff Legend

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