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.111 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.121 by root, Sun Sep 14 23:13:25 2008 UTC

… …
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, "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 = NULL; /* 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;
413 } 423 }
414 424
415 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
… …
519 529
520bool 530bool
521object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
522{ 532{
523 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
524 535
525 for (;;) 536 for (;;)
526 { 537 {
527 switch (f.kw) 538 switch (f.kw)
528 { 539 {
… …
549 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
550 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
551 case KW_tag: f.get_ornull (tag); break; 562 case KW_tag: f.get_ornull (tag); break;
552 563
553 case KW_arch: 564 case KW_arch:
554 {
555 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
556 tmp->deactivate ();
557
558 { 566 {
567 tmp->deactivate ();
568
559 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
560 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
561 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
562 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
563 // and finally we do not want any funny effects 573 // and finally we do not want any funny effects
… …
580 590
581 tmp->below = 0; 591 tmp->below = 0;
582 tmp->env = this; 592 tmp->env = this;
583 op_inv = tmp; 593 op_inv = tmp;
584 } 594 }
585 }
586 continue; 595 continue;
587 596
588 case KW_other_arch: 597 case KW_other_arch:
589 if (loading_arch == this) 598 if (loading_arch == this)
590 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 599 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
606 CLEAR_FLAG (this, FLAG_ANIMATE); 615 CLEAR_FLAG (this, FLAG_ANIMATE);
607 animation_id = 0; 616 animation_id = 0;
608 617
609 const char *str = f.get_str (); 618 const char *str = f.get_str ();
610 if (str && (animation_id = find_animation (str))) 619 if (str && (animation_id = find_animation (str)))
611 SET_FLAG (this, FLAG_ANIMATE); 620 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612 } 621 }
613 break; 622 break;
614 623
615 case KW_last_heal: f.get (last_heal); break; 624 case KW_last_heal: f.get (last_heal); break;
616 case KW_last_sp: f.get (last_sp); break; 625 case KW_last_sp: f.get (last_sp); break;
… …
920 case KW_expmul: f.get (expmul); break; 929 case KW_expmul: f.get (expmul); break;
921 case KW_glow_radius: f.get (glow_radius); break; 930 case KW_glow_radius: f.get (glow_radius); break;
922 case KW_weapontype: f.get (weapontype); break; 931 case KW_weapontype: f.get (weapontype); break;
923 case KW_tooltype: f.get (tooltype); break; 932 case KW_tooltype: f.get (tooltype); break;
924 case KW_casting_time: f.get (casting_time); break; 933 case KW_casting_time: f.get (casting_time); break;
934
935 // elevation is deprecated
925 case KW_elevation: f.get (elevation); break; 936 case KW_elevation: break;
937
926 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 938 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
927 case KW_client_type: f.get (client_type); break; 939 case KW_client_type: f.get (client_type); break;
928 case KW_duration: f.get (duration); break; 940 case KW_duration: f.get (duration); break;
929 case KW_range: f.get (range); break; 941 case KW_range: f.get (range); break;
930 case KW_range_modifier: f.get (range_modifier); break; 942 case KW_range_modifier: f.get (range_modifier); break;
… …
987 999
988 f.next (); 1000 f.next ();
989 return true; 1001 return true;
990 1002
991 case KW_ERROR: 1003 case KW_ERROR:
992 set_ob_key_value (this, f.kw_str, f.value, true); 1004 // append as key value pair (do not use kv_set as it prepends)
1005 // we also do not even try to find old values, duplicate keys stay duplicate
1006 {
1007 key_value *kv = new key_value;
1008
1009 kv->next = 0;
1010 kv->key = shstr (f.kw_str);
1011 kv->value = shstr (f.value);
1012
1013 if (!last_kv)
1014 key_values = last_kv = kv;
1015 else
1016 {
1017 while (last_kv->next)
1018 last_kv = last_kv->next;
1019
1020 last_kv->next = kv;
1021 last_kv = kv;
1022 }
1023 }
993 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1024 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994 break; 1025 break;
995 1026
996 default: 1027 default:
997 if (!f.parse_error ("object", name)) 1028 if (!f.parse_error ("object", name))
… …
1018 1049
1019 assert (arch); //D maybe use exception handling of sorts? 1050 assert (arch); //D maybe use exception handling of sorts?
1020 1051
1021 f.next (); 1052 f.next ();
1022 1053
1023 object *op = object::create (); 1054 object *op = arch->instance ();
1024
1025 op->map = map; 1055 op->map = map;
1026 arch->copy_to (op);
1027 // copy_to activates, this should be fixed properly 1056 // instance() activates, this should be fixed properly
1028 op->deactivate (); 1057 op->deactivate ();
1029 1058
1030 if (!op->parse_kv (f)) 1059 if (!op->parse_kv (f))
1031 { 1060 {
1032 op->destroy (true); 1061 op->destroy (true);
… …
1242 /* 110 */ 1271 /* 110 */
1243 KW_destroy_on_death, 1272 KW_destroy_on_death,
1244 KW_NULL, 1273 KW_NULL,
1245 }; 1274 };
1246 1275
1247 int i;
1248
1249 /* This saves the key/value lists. We do it first so that any 1276 /* This saves the key/value lists. We do it first so that any
1250 * keys that match field names will be overwritten by the loader. 1277 * keys that match field names will be overwritten by the loader.
1251 */ 1278 */
1252 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1279 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 { 1280 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1254 /* Find the field in the opposing member. */ 1281 f.put (kv->key, kv->value);
1255 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256
1257 /* If there's no partnering field, or it's got a different value, save our field. */
1258 if (!arch_field || my_field->value != arch_field->value)
1259 f.put (my_field->key, my_field->value);
1260 }
1261 1282
1262 /* We don't need to worry about the arch's extra fields - they 1283 /* We don't need to worry about the arch's extra fields - they
1263 * will get taken care of the copy_to method. 1284 * will get taken care of the copy_to method.
1264 */ 1285 */
1265 1286
… …
1274 CMP_OUT (name); 1295 CMP_OUT (name);
1275 CMP_OUT (name_pl); 1296 CMP_OUT (name_pl);
1276 CMP_OUT (custom_name); 1297 CMP_OUT (custom_name);
1277 CMP_OUT (title); 1298 CMP_OUT (title);
1278 CMP_OUT (race); 1299 CMP_OUT (race);
1300 CMP_OUT (skill);
1279 CMP_OUT (slaying); 1301 CMP_OUT (slaying);
1280 CMP_OUT (tag); 1302 CMP_OUT (tag);
1281 CMP_OUT (other_arch); 1303 CMP_OUT (other_arch);
1282 1304
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1305 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1309 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); 1310 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1311
1290 if (op->animation_id != tmp->animation_id) 1312 if (op->animation_id != tmp->animation_id)
1291 if (op->animation_id) 1313 if (op->animation_id)
1314 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1315 else
1292 { 1316 {
1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1317 f.put (KW_animation, (const char *)0);
1294 1318 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1295 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1296 f.put (KW_is_animated, (sint32)0);
1297 } 1319 }
1298 else
1299 f.put (KW_animation, (const char *)0);
1300 1320
1301 CMP_OUT2 (str, stats.Str); 1321 CMP_OUT2 (str, stats.Str);
1302 CMP_OUT2 (dex, stats.Dex); 1322 CMP_OUT2 (dex, stats.Dex);
1303 CMP_OUT2 (con, stats.Con); 1323 CMP_OUT2 (con, stats.Con);
1304 CMP_OUT2 (wis, stats.Wis); 1324 CMP_OUT2 (wis, stats.Wis);
… …
1334 CMP_OUT (direction); 1354 CMP_OUT (direction);
1335 CMP_OUT (type); 1355 CMP_OUT (type);
1336 CMP_OUT (subtype); 1356 CMP_OUT (subtype);
1337 CMP_OUT (attacktype); 1357 CMP_OUT (attacktype);
1338 1358
1339 for (i = 0; i < NROFATTACKS; i++) 1359 for (int i = 0; i < NROFATTACKS; i++)
1340 if (expect_false (op->resist[i] != tmp->resist[i])) 1360 if (expect_false (op->resist[i] != tmp->resist[i]))
1341 f.put (resist_save[i], op->resist[i]); 1361 f.put (resist_save[i], op->resist[i]);
1342 1362
1343 CMP_OUT (path_attuned); 1363 CMP_OUT (path_attuned);
1344 CMP_OUT (path_repelled); 1364 CMP_OUT (path_repelled);
… …
1355 CMP_OUT (last_sp); 1375 CMP_OUT (last_sp);
1356 CMP_OUT (last_grace); 1376 CMP_OUT (last_grace);
1357 CMP_OUT (last_eat); 1377 CMP_OUT (last_eat);
1358 CMP_OUT (glow_radius); 1378 CMP_OUT (glow_radius);
1359 1379
1360 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1380 if (op->flag [FLAG_IS_LINKED])
1381 if (int i = get_button_value (op))
1361 f.put (KW_connected, i); 1382 f.put (KW_connected, i);
1362 1383
1363 CMP_OUT (randomitems); 1384 CMP_OUT (randomitems);
1364 CMP_OUT2 (container, weight_limit); 1385 CMP_OUT2 (container, weight_limit);
1365 1386
1366 CMP_OUT (run_away); 1387 CMP_OUT (run_away);
1367 CMP_OUT (pick_up); 1388 CMP_OUT (pick_up);
1368 CMP_OUT (will_apply); 1389 CMP_OUT (will_apply);
1369 CMP_OUT (smoothlevel); 1390 CMP_OUT (smoothlevel);
1370 CMP_OUT (weapontype); 1391 CMP_OUT (weapontype);
1371 CMP_OUT (tooltype); 1392 CMP_OUT (tooltype);
1372 CMP_OUT (elevation);
1373 CMP_OUT (client_type); 1393 CMP_OUT (client_type);
1374 CMP_OUT (item_power); 1394 CMP_OUT (item_power);
1375 CMP_OUT (duration); 1395 CMP_OUT (duration);
1376 CMP_OUT (range); 1396 CMP_OUT (range);
1377 CMP_OUT (range_modifier); 1397 CMP_OUT (range_modifier);
… …
1386 CMP_OUT (move_off); 1406 CMP_OUT (move_off);
1387 CMP_OUT (move_slow); 1407 CMP_OUT (move_slow);
1388 CMP_OUT (move_slow_penalty); 1408 CMP_OUT (move_slow_penalty);
1389 1409
1390 if (op->flag != tmp->flag) 1410 if (op->flag != tmp->flag)
1391 for (i = 0; i <= NUM_FLAGS; i++) 1411 for (int i = 0; i <= NUM_FLAGS; i++)
1392 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1412 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1393 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1413 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1394 1414
1395 // save body locations 1415 // save body locations
1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1416 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1397 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1417 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1398 f.put (body_locations[i].save_name, op->slot[i].info); 1418 f.put (body_locations[i].save_name, op->slot[i].info);
1399} 1419}
1400 1420
1401/* 1421/*

Diff Legend

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