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.115 by root, Sun May 4 19:14:23 2008 UTC vs.
Revision 1.133 by root, Wed Sep 23 04:07:52 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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
… …
257void 257void
258object::post_load_check () 258object::post_load_check ()
259{ 259{
260 if (type >= NUM_TYPES) 260 if (type >= NUM_TYPES)
261 { 261 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 262 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0; 263 type = 0;
264 } 264 }
265 265
266 switch (type) 266 switch (type)
267 { 267 {
… …
269 case WAND: 269 case WAND:
270 case ROD: 270 case ROD:
271 case HORN: 271 case HORN:
272 if (slot [body_range].info != -1) 272 if (slot [body_range].info != -1)
273 { 273 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 274 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 275 slot [body_range].info = -1;
276 } 276 }
277 break; 277 break;
278 278
279 case WEAPON: 279 case WEAPON:
280 if (slot [body_combat].info != -1) 280 if (slot [body_combat].info != -1)
281 { 281 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 282 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 283 slot [body_combat].info = -1;
284 } 284 }
285 break; 285 break;
286 286
287 case SHIELD: 287 case SHIELD:
288 if (slot [body_shield].info != -1) 288 if (slot [body_shield].info != -1)
289 { 289 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 290 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 291 slot [body_shield].info = -1;
292 } 292 }
293 break; 293 break;
294 294
295 case PLAYER: 295 case PLAYER:
296 if (slot [body_shield].info != 1) 296 if (slot [body_shield].info != 1)
297 { 297 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 298 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 299 slot [body_shield].info = 1;
300 } 300 }
301 301
302 if (slot [body_combat].info != 1) 302 if (slot [body_combat].info != 1)
303 { 303 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 304 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 305 slot [body_combat].info = 1;
306 } 306 }
307 307
308 if (slot [body_range].info != 1) 308 if (slot [body_range].info != 1)
309 { 309 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 310 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 311 slot [body_range].info = 1;
312 } 312 }
313 break; 313 break;
314 } 314 }
315 315
… …
338 * not in the ideal fashion. 338 * not in the ideal fashion.
339 */ 339 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 341 {
342 if (!skill) 342 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 344 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 345 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 347 }
348 348
349 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 351 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
359 { 359 {
360 if (last_heal) 360 if (last_heal)
361 { 361 {
362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
363 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
364 last_heal = 0; 364 last_heal = 0;
365 } 365 }
366 366
367 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
368 368
369 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 370 if (!item_power && ip)
371 { 371 {
372 if (ip > 3) 372 if (ip > 3)
373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 373 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
374 374
375 item_power = ip; 375 item_power = ip;
376 } 376 }
377 377
378 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
… …
385 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif 387#endif
388 } 388 }
389 389
390 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
391 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
392 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
394 { 403 {
404 // TODO: fix firewall object on map
395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
396 * in that spell was stored in sp. 406 * in that spell was stored in sp.
397 */ 407 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
400 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
401 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
402 } 412 }
403 413
404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
406 { 416 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 417 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
408 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
409 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
410 randomitems = 0; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
411 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
412 value = arch->value * inv->value; 422 value = arch->value * inv->value;
… …
414 424
415 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
416 { 426 {
417 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
418 { 428 {
419 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 429 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
420 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
421 } 431 }
422 432
423 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
424 if (move_type == 0) 434 if (move_type == 0)
… …
450 stats.maxhp = 0; 460 stats.maxhp = 0;
451 } 461 }
452 else 462 else
453 move_type = MOVE_WALK; 463 move_type = MOVE_WALK;
454 } 464 }
465 }
466
467 // if the object has an animation, try to provide a default face
468 if (has_anim ())
469 {
470 const animation &anim_ob = anim ();
471
472 if (anim_speed)
473 // if this item is time-animated, force the last frame
474 animate_object (this, 0);
475 else if (flag [FLAG_MONSTER])
476 // if it is a monster, set appropriate facing
477 animate_object (this, direction);
455 } 478 }
456} 479}
457 480
458static void 481static void
459set_move (MoveType &mt, const char *str) 482set_move (MoveType &mt, const char *str)
… …
550 case KW_race: f.get_ornull (race); break; 573 case KW_race: f.get_ornull (race); break;
551 case KW_slaying: f.get_ornull (slaying); break; 574 case KW_slaying: f.get_ornull (slaying); break;
552 case KW_tag: f.get_ornull (tag); break; 575 case KW_tag: f.get_ornull (tag); break;
553 576
554 case KW_arch: 577 case KW_arch:
555 {
556 object *tmp = object::read (f); 578 if (object *tmp = object::read (f))
557 tmp->deactivate ();
558
559 { 579 {
580 tmp->deactivate ();
581
560 // was: insert_ob_in_ob (tmp, op); 582 // was: insert_ob_in_ob (tmp, op);
561 // but manually adding it can improve map loading times a lot 583 // but manually adding it can improve map loading times a lot
562 // also, appending instead of prepending keeps the 584 // also, appending instead of prepending keeps the
563 // save ordering the same between repeated load/saves. 585 // save ordering the same between repeated load/saves.
564 // and finally we do not want any funny effects 586 // and finally we do not want any funny effects
… …
581 603
582 tmp->below = 0; 604 tmp->below = 0;
583 tmp->env = this; 605 tmp->env = this;
584 op_inv = tmp; 606 op_inv = tmp;
585 } 607 }
586 } 608 else
609 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
610
587 continue; 611 continue;
588 612
589 case KW_other_arch: 613 case KW_other_arch:
590 if (loading_arch == this) 614 if (loading_arch == this)
591 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 615 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 632 animation_id = 0;
609 633
610 const char *str = f.get_str (); 634 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 635 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 636 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 637 }
614 break; 638 break;
615 639
616 case KW_last_heal: f.get (last_heal); break; 640 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 641 case KW_last_sp: f.get (last_sp); break;
… …
916 case KW_anim_speed: f.get (anim_speed); break; 940 case KW_anim_speed: f.get (anim_speed); break;
917 case KW_container: f.get (weight_limit); break; 941 case KW_container: f.get (weight_limit); break;
918 case KW_will_apply: f.get (will_apply); break; 942 case KW_will_apply: f.get (will_apply); break;
919 case KW_attack_movement: f.get (attack_movement); break; 943 case KW_attack_movement: f.get (attack_movement); break;
920 case KW_move_state: f.get (move_status); break; 944 case KW_move_state: f.get (move_status); break;
921 case KW_expmul: f.get (expmul); break; 945 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
922 case KW_glow_radius: f.get (glow_radius); break; 946 case KW_glow_radius: f.get (glow_radius); break;
923 case KW_weapontype: f.get (weapontype); break; 947 case KW_weapontype: f.get (weapontype); break;
924 case KW_tooltype: f.get (tooltype); break;
925 case KW_casting_time: f.get (casting_time); break; 948 case KW_casting_time: f.get (casting_time); break;
949
950 // elevation is deprecated
926 case KW_elevation: f.get (elevation); break; 951 case KW_elevation: break;
952
927 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 953 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
928 case KW_client_type: f.get (client_type); break; 954 case KW_client_type: f.get (client_type); break;
929 case KW_duration: f.get (duration); break; 955 case KW_duration: f.get (duration); break;
930 case KW_range: f.get (range); break; 956 case KW_range: f.get (range); break;
931 case KW_range_modifier: f.get (range_modifier); break; 957 case KW_range_modifier: f.get (range_modifier); break;
… …
950 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 976 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
951 case KW_can_apply: 977 case KW_can_apply:
952 break; 978 break;
953 979
954 case KW_connected: 980 case KW_connected:
955 add_button_link (this, map, f.get_sint32 ()); 981 {
982 shstr connected;
983
984 f.get (connected);
985 add_link (map, connected);
986 }
956 break; 987 break;
957 988
958 case KW_randomitems: 989 case KW_randomitems:
959 if (f.get_str ()) 990 if (f.get_str ())
960 { 991 {
… …
1045 // instance() activates, this should be fixed properly 1076 // instance() activates, this should be fixed properly
1046 op->deactivate (); 1077 op->deactivate ();
1047 1078
1048 if (!op->parse_kv (f)) 1079 if (!op->parse_kv (f))
1049 { 1080 {
1050 op->destroy (true); 1081 op->destroy ();
1051 return 0; 1082 return 0;
1052 } 1083 }
1053 1084
1054 op->post_load_check (); 1085 op->post_load_check ();
1055 return op; 1086 return op;
… …
1271 1302
1272 /* We don't need to worry about the arch's extra fields - they 1303 /* We don't need to worry about the arch's extra fields - they
1273 * will get taken care of the copy_to method. 1304 * will get taken care of the copy_to method.
1274 */ 1305 */
1275 1306
1307 if (op->uuid)
1276 f.put (KW_uuid, op->uuid.c_str ()); 1308 f.put (KW_uuid, op->uuid.c_str ());
1277 1309
1278#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1310#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1279#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1311#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1280 1312
1281 if (object *owner = op->owner) 1313 if (object *owner = op->owner)
… …
1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1329 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); 1330 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); 1331 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1332
1301 if (op->animation_id != tmp->animation_id) 1333 if (op->animation_id != tmp->animation_id)
1302 if (op->animation_id) 1334 if (op->has_anim ())
1335 f.put (KW_animation, op->anim ().name);
1336 else
1303 { 1337 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1338 f.put (KW_animation, (const char *)0);
1305 1339 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0);
1308 } 1340 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1341
1312 CMP_OUT2 (str, stats.Str); 1342 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1343 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1344 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1345 CMP_OUT2 (wis, stats.Wis);
… …
1367 CMP_OUT (last_grace); 1397 CMP_OUT (last_grace);
1368 CMP_OUT (last_eat); 1398 CMP_OUT (last_eat);
1369 CMP_OUT (glow_radius); 1399 CMP_OUT (glow_radius);
1370 1400
1371 if (op->flag [FLAG_IS_LINKED]) 1401 if (op->flag [FLAG_IS_LINKED])
1372 if (int i = get_button_value (op)) 1402 if (auto (ol, op->find_link ()))
1373 f.put (KW_connected, i); 1403 f.put (KW_connected, ol->id);
1374 1404
1375 CMP_OUT (randomitems); 1405 CMP_OUT (randomitems);
1376 CMP_OUT2 (container, weight_limit); 1406 CMP_OUT2 (container, weight_limit);
1377 1407
1378 CMP_OUT (run_away); 1408 CMP_OUT (run_away);
1379 CMP_OUT (pick_up); 1409 CMP_OUT (pick_up);
1380 CMP_OUT (will_apply); 1410 CMP_OUT (will_apply);
1381 CMP_OUT (smoothlevel); 1411 CMP_OUT (smoothlevel);
1382 CMP_OUT (weapontype); 1412 CMP_OUT (weapontype);
1383 CMP_OUT (tooltype);
1384 CMP_OUT (elevation);
1385 CMP_OUT (client_type); 1413 CMP_OUT (client_type);
1386 CMP_OUT (item_power); 1414 CMP_OUT (item_power);
1387 CMP_OUT (duration); 1415 CMP_OUT (duration);
1388 CMP_OUT (range); 1416 CMP_OUT (range);
1389 CMP_OUT (range_modifier); 1417 CMP_OUT (range_modifier);
… …
1416 * the only place this is not set is when saving the player. 1444 * the only place this is not set is when saving the player.
1417 */ 1445 */
1418bool 1446bool
1419object::write (object_freezer &f) 1447object::write (object_freezer &f)
1420{ 1448{
1421 archetype *at = arch ? arch : archetype::empty; 1449 if (is_arch ())
1422 1450 {
1451 f.put (KW_object, arch->archname);
1452 write_diff (f, this, archetype::empty);
1453 }
1454 else
1455 {
1423 f.put (KW_arch, at->archname); 1456 f.put (KW_arch, arch->archname);
1424 write_diff (f, this, at); 1457 write_diff (f, this, arch);
1458 }
1425 1459
1426 for (object *tmp = inv; tmp; tmp = tmp->below) 1460 for (object *tmp = inv; tmp; tmp = tmp->below)
1427 tmp->write (f); 1461 tmp->write (f);
1428 1462
1429 f.put (this); 1463 f.put (this);

Diff Legend

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