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.108 by elmex, Sun Apr 13 13:32:48 2008 UTC vs.
Revision 1.117 by elmex, Sun Jun 15 20:29:56 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 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
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 23
28#include <global.h> 24#include <global.h>
29#include <loader.h> 25#include <loader.h>
30#include <sproto.h> 26#include <sproto.h>
31 27
… …
361 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
363 { 359 {
364 if (last_heal) 360 if (last_heal)
365 { 361 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
368 last_heal = 0; 364 last_heal = 0;
369 } 365 }
370 366
371 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
… …
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
398 { 394 {
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 396 * in that spell was stored in sp.
401 */ 397 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 400 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 401 randomitems = NULL; /* So another spell isn't created for this object */
405 } 402 }
406 403
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 406 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 408 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 409 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 410 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 411 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 412 value = arch->value * inv->value;
415 } 413 }
416 414
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 415 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 416 {
419 if (stats.hp > stats.maxhp) 417 if (stats.hp > stats.maxhp)
420 { 418 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 419 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 420 stats.maxhp = stats.hp;
423 } 421 }
424 422
425 /* The archs just need to be updated for this */ 423 /* The archs just need to be updated for this */
426 if (move_type == 0) 424 if (move_type == 0)
427 move_type = MOVE_WALK; 425 move_type = MOVE_WALK;
428 } 426 }
429 427
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 428 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 429 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 430 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 431 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 432 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 433 */
434 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 435 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 436
440 /* Handle player movers. We use move_type for player movers 437 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 438 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 439 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 440 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 441 * are doing, otherwise, set move_type based on maxhp value.
445 */ 442 */
446 if (type == PLAYERMOVER) 443 if (type == PLAYERMOVER)
447 { 444 {
448 if (!move_type) 445 if (!move_type)
… …
510 507
511 goto next; 508 goto next;
512 } 509 }
513 } 510 }
514 511
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 512 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 513
517next: ; 514next: ;
518 } 515 }
519} 516}
520 517
… …
522 519
523bool 520bool
524object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
525{ 522{
526 object *op_inv = inv; 523 object *op_inv = inv;
524 key_value *last_kv = key_values;
527 525
528 for (;;) 526 for (;;)
529 { 527 {
530 switch (f.kw) 528 switch (f.kw)
531 { 529 {
… …
587 } 585 }
588 } 586 }
589 continue; 587 continue;
590 588
591 case KW_other_arch: 589 case KW_other_arch:
592 other_arch =
593 loading_arch 590 if (loading_arch == this)
594 ? archetype::get (f.get_str ()) 591 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
592 else
593 {
595 : archetype::find (f.get_str ()); 594 other_arch = archetype::find (f.get_str ());
596 595
597 if (!other_arch) 596 if (!other_arch)
598 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); 597 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
598 }
599 break; 599 break;
600 600
601 case KW_owner: 601 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ()); 602 f.delayed_deref (this, owner, f.get_str ());
603 break; 603 break;
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 607 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 608 animation_id = 0;
609 609
610 const char *str = f.get_str (); 610 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 611 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 612 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 613 }
614 break; 614 break;
615 615
616 case KW_last_heal: f.get (last_heal); break; 616 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 617 case KW_last_sp: f.get (last_sp); break;
… …
921 case KW_expmul: f.get (expmul); break; 921 case KW_expmul: f.get (expmul); break;
922 case KW_glow_radius: f.get (glow_radius); break; 922 case KW_glow_radius: f.get (glow_radius); break;
923 case KW_weapontype: f.get (weapontype); break; 923 case KW_weapontype: f.get (weapontype); break;
924 case KW_tooltype: f.get (tooltype); break; 924 case KW_tooltype: f.get (tooltype); break;
925 case KW_casting_time: f.get (casting_time); break; 925 case KW_casting_time: f.get (casting_time); break;
926
927 // elevation is deprecated
926 case KW_elevation: f.get (elevation); break; 928 case KW_elevation: break;
929
927 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
928 case KW_client_type: f.get (client_type); break; 931 case KW_client_type: f.get (client_type); break;
929 case KW_duration: f.get (duration); break; 932 case KW_duration: f.get (duration); break;
930 case KW_range: f.get (range); break; 933 case KW_range: f.get (range); break;
931 case KW_range_modifier: f.get (range_modifier); break; 934 case KW_range_modifier: f.get (range_modifier); break;
… …
988 991
989 f.next (); 992 f.next ();
990 return true; 993 return true;
991 994
992 case KW_ERROR: 995 case KW_ERROR:
993 set_ob_key_value (this, f.kw_str, f.value, true); 996 // append as key value pair (do not use kv_set as it prepends)
997 // we also do not even try to find old values, duplicate keys stay duplicate
998 {
999 key_value *kv = new key_value;
1000
1001 kv->next = 0;
1002 kv->key = shstr (f.kw_str);
1003 kv->value = shstr (f.value);
1004
1005 if (!last_kv)
1006 key_values = last_kv = kv;
1007 else
1008 {
1009 while (last_kv->next)
1010 last_kv = last_kv->next;
1011
1012 last_kv->next = kv;
1013 last_kv = kv;
1014 }
1015 }
994 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1016 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
995 break; 1017 break;
996 1018
997 default: 1019 default:
998 if (!f.parse_error ("object", name)) 1020 if (!f.parse_error ("object", name))
… …
1019 1041
1020 assert (arch); //D maybe use exception handling of sorts? 1042 assert (arch); //D maybe use exception handling of sorts?
1021 1043
1022 f.next (); 1044 f.next ();
1023 1045
1024 object *op = object::create (); 1046 object *op = arch->instance ();
1025
1026 op->map = map; 1047 op->map = map;
1027 arch->copy_to (op);
1028 // copy_to activates, this should be fixed properly 1048 // instance() activates, this should be fixed properly
1029 op->deactivate (); 1049 op->deactivate ();
1030 1050
1031 if (!op->parse_kv (f)) 1051 if (!op->parse_kv (f))
1032 { 1052 {
1033 op->destroy (true); 1053 op->destroy (true);
… …
1243 /* 110 */ 1263 /* 110 */
1244 KW_destroy_on_death, 1264 KW_destroy_on_death,
1245 KW_NULL, 1265 KW_NULL,
1246 }; 1266 };
1247 1267
1248 int i;
1249
1250 /* This saves the key/value lists. We do it first so that any 1268 /* This saves the key/value lists. We do it first so that any
1251 * keys that match field names will be overwritten by the loader. 1269 * keys that match field names will be overwritten by the loader.
1252 */ 1270 */
1253 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1271 for (key_value *kv = op->key_values; kv; kv = kv->next)
1254 { 1272 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1255 /* Find the field in the opposing member. */ 1273 f.put (kv->key, kv->value);
1256 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1257
1258 /* If there's no partnering field, or it's got a different value, save our field. */
1259 if (!arch_field || my_field->value != arch_field->value)
1260 f.put (my_field->key, my_field->value);
1261 }
1262 1274
1263 /* We don't need to worry about the arch's extra fields - they 1275 /* We don't need to worry about the arch's extra fields - they
1264 * will get taken care of the copy_to method. 1276 * will get taken care of the copy_to method.
1265 */ 1277 */
1266 1278
… …
1275 CMP_OUT (name); 1287 CMP_OUT (name);
1276 CMP_OUT (name_pl); 1288 CMP_OUT (name_pl);
1277 CMP_OUT (custom_name); 1289 CMP_OUT (custom_name);
1278 CMP_OUT (title); 1290 CMP_OUT (title);
1279 CMP_OUT (race); 1291 CMP_OUT (race);
1292 CMP_OUT (skill);
1280 CMP_OUT (slaying); 1293 CMP_OUT (slaying);
1281 CMP_OUT (tag); 1294 CMP_OUT (tag);
1282 CMP_OUT (other_arch); 1295 CMP_OUT (other_arch);
1283 1296
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1297 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1288 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1301 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1302 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1303
1291 if (op->animation_id != tmp->animation_id) 1304 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1305 if (op->animation_id)
1306 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1307 else
1293 { 1308 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1309 f.put (KW_animation, (const char *)0);
1295 1310 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32)0);
1298 } 1311 }
1299 else
1300 f.put (KW_animation, (const char *)0);
1301 1312
1302 CMP_OUT2 (str, stats.Str); 1313 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1314 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1315 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1316 CMP_OUT2 (wis, stats.Wis);
… …
1335 CMP_OUT (direction); 1346 CMP_OUT (direction);
1336 CMP_OUT (type); 1347 CMP_OUT (type);
1337 CMP_OUT (subtype); 1348 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1349 CMP_OUT (attacktype);
1339 1350
1340 for (i = 0; i < NROFATTACKS; i++) 1351 for (int i = 0; i < NROFATTACKS; i++)
1341 if (expect_false (op->resist[i] != tmp->resist[i])) 1352 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1353 f.put (resist_save[i], op->resist[i]);
1343 1354
1344 CMP_OUT (path_attuned); 1355 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1356 CMP_OUT (path_repelled);
… …
1356 CMP_OUT (last_sp); 1367 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1368 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1369 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1370 CMP_OUT (glow_radius);
1360 1371
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1372 if (op->flag [FLAG_IS_LINKED])
1373 if (int i = get_button_value (op))
1362 f.put (KW_connected, i); 1374 f.put (KW_connected, i);
1363 1375
1364 CMP_OUT (randomitems); 1376 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1377 CMP_OUT2 (container, weight_limit);
1366 1378
1367 CMP_OUT (run_away); 1379 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1380 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1381 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1382 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1383 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype); 1384 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1385 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1386 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1387 CMP_OUT (duration);
1377 CMP_OUT (range); 1388 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1389 CMP_OUT (range_modifier);
… …
1387 CMP_OUT (move_off); 1398 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1399 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1400 CMP_OUT (move_slow_penalty);
1390 1401
1391 if (op->flag != tmp->flag) 1402 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1403 for (int i = 0; i <= NUM_FLAGS; i++)
1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1404 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1405 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1406
1396 // save body locations 1407 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1408 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1409 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1410 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1411}
1401 1412
1402/* 1413/*
… …
1405 * the only place this is not set is when saving the player. 1416 * the only place this is not set is when saving the player.
1406 */ 1417 */
1407bool 1418bool
1408object::write (object_freezer &f) 1419object::write (object_freezer &f)
1409{ 1420{
1410 archetype *at = arch ? (archetype *)arch : empty_archetype; 1421 archetype *at = arch ? arch : archetype::empty;
1411 1422
1412 f.put (KW_arch, at->archname); 1423 f.put (KW_arch, at->archname);
1413 write_diff (f, this, at); 1424 write_diff (f, this, at);
1414 1425
1415 for (object *tmp = inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1423 1434
1424///////////////////////////////////////////////////////////////////////////// 1435/////////////////////////////////////////////////////////////////////////////
1425 1436
1426// generic resource file load, 1437// generic resource file load,
1427// currently supports: region, treasures, archetypes 1438// currently supports: region, treasures, archetypes
1439bool
1428bool load_resource_file (const char *filename) 1440load_resource_file_ (const char *filename)
1429{ 1441{
1430 object_thawer f (filename); 1442 object_thawer f (filename);
1431
1432 bool success = false;
1433 bool seen_arch = false;
1434 1443
1435 for (;;) 1444 for (;;)
1436 { 1445 {
1437 switch (f.kw) 1446 switch (f.kw)
1438 { 1447 {
1439 case KW_region: 1448 case KW_region:
1440 if (!region::read (f)) 1449 if (!region::read (f))
1441 goto finish; 1450 return false;
1442 break; 1451 break;
1443 1452
1444 case KW_treasure: 1453 case KW_treasure:
1445 case KW_treasureone: 1454 case KW_treasureone:
1446 if (!treasurelist::read (f)) 1455 if (!treasurelist::read (f))
1447 goto finish; 1456 return false;
1448 break; 1457 break;
1449 1458
1450 case KW_object: 1459 case KW_object:
1451 seen_arch = true;
1452 if (!archetype::read (f)) 1460 if (!archetype::read (f))
1453 goto finish; 1461 return false;
1454 break; 1462 break;
1455 1463
1456 case KW_EOF: 1464 case KW_EOF:
1457 success = true; 1465 return true;
1458 goto finish;
1459 1466
1460 default: 1467 default:
1461 if (!f.parse_error ("resource file")) 1468 if (!f.parse_error ("resource file"))
1462 goto finish; 1469 return false;
1463 1470
1464 f.next (); 1471 f.next ();
1465 break; 1472 break;
1466 } 1473 }
1467 } 1474 }
1468
1469finish:
1470 if (seen_arch)
1471 init_archetype_pointers ();
1472
1473 return success;
1474} 1475}
1475 1476

Diff Legend

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