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.122 by root, Mon Sep 15 00:16:19 2008 UTC vs.
Revision 1.135 by root, Fri Oct 23 03:08:34 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
257void 258void
258object::post_load_check () 259object::post_load_check ()
259{ 260{
260 if (type >= NUM_TYPES) 261 if (type >= NUM_TYPES)
261 { 262 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 263 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0; 264 type = 0;
264 } 265 }
265 266
266 switch (type) 267 switch (type)
267 { 268 {
… …
269 case WAND: 270 case WAND:
270 case ROD: 271 case ROD:
271 case HORN: 272 case HORN:
272 if (slot [body_range].info != -1) 273 if (slot [body_range].info != -1)
273 { 274 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 276 slot [body_range].info = -1;
276 } 277 }
277 break; 278 break;
278 279
279 case WEAPON: 280 case WEAPON:
280 if (slot [body_combat].info != -1) 281 if (slot [body_combat].info != -1)
281 { 282 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 284 slot [body_combat].info = -1;
284 } 285 }
285 break; 286 break;
286 287
287 case SHIELD: 288 case SHIELD:
288 if (slot [body_shield].info != -1) 289 if (slot [body_shield].info != -1)
289 { 290 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 292 slot [body_shield].info = -1;
292 } 293 }
293 break; 294 break;
294 295
295 case PLAYER: 296 case PLAYER:
296 if (slot [body_shield].info != 1) 297 if (slot [body_shield].info != 1)
297 { 298 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 300 slot [body_shield].info = 1;
300 } 301 }
301 302
302 if (slot [body_combat].info != 1) 303 if (slot [body_combat].info != 1)
303 { 304 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 306 slot [body_combat].info = 1;
306 } 307 }
307 308
308 if (slot [body_range].info != 1) 309 if (slot [body_range].info != 1)
309 { 310 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 311 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 312 slot [body_range].info = 1;
312 } 313 }
313 break; 314 break;
314 } 315 }
315 316
… …
338 * not in the ideal fashion. 339 * not in the ideal fashion.
339 */ 340 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 342 {
342 if (!skill) 343 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 346 (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); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 348 }
348 349
349 /* We changed last_heal to gen_sp_armour, which is what it 350 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 352 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 358 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 359 || type == BRACERS || type == CLOAK)
359 { 360 {
360 if (last_heal) 361 if (last_heal)
361 { 362 {
362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
363 gen_sp_armour = last_heal; 364 gen_sp_armour = last_heal;
364 last_heal = 0; 365 last_heal = 0;
365 } 366 }
366 367
367 int ip = calc_item_power (this, 0); 368 int ip = calc_item_power (this, 0);
368 369
369 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 371 if (!item_power && ip)
371 { 372 {
372 if (ip > 3) 373 if (ip > 3)
373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
374 375
375 item_power = ip; 376 item_power = ip;
376 } 377 }
377 378
378 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
… …
412 } 413 }
413 414
414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 415 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
416 { 417 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
418 object *tmp = get_archetype_by_object_name (slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
419 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
420 randomitems = 0; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
421 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
422 value = arch->value * inv->value; 423 value = arch->value * inv->value;
… …
424 425
425 if (QUERY_FLAG (this, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
426 { 427 {
427 if (stats.hp > stats.maxhp) 428 if (stats.hp > stats.maxhp)
428 { 429 {
429 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
430 stats.maxhp = stats.hp; 431 stats.maxhp = stats.hp;
431 } 432 }
432 433
433 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
434 if (move_type == 0) 435 if (move_type == 0)
… …
460 stats.maxhp = 0; 461 stats.maxhp = 0;
461 } 462 }
462 else 463 else
463 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
464 } 465 }
466 }
467
468 // if the object has an animation, try to provide a default face
469 if (has_anim ())
470 {
471 const animation &anim_ob = anim ();
472
473 if (anim_speed)
474 // if this item is time-animated, force the last frame
475 animate_object (this, 0);
476 else if (flag [FLAG_MONSTER])
477 // if it is a monster, set appropriate facing
478 animate_object (this, direction);
465 } 479 }
466} 480}
467 481
468static void 482static void
469set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
… …
927 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
935 case KW_tooltype: f.get (tooltype); break;
936 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
937 950
938 // elevation is deprecated 951 // elevation is deprecated
939 case KW_elevation: break; 952 case KW_elevation: break;
940 953
… …
964 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
965 case KW_can_apply: 978 case KW_can_apply:
966 break; 979 break;
967 980
968 case KW_connected: 981 case KW_connected:
969 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
970 break; 988 break;
971 989
972 case KW_randomitems: 990 case KW_randomitems:
973 if (f.get_str ()) 991 if (f.get_str ())
974 { 992 {
… …
976 loading_arch 994 loading_arch
977 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
978 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
979 997
980 if (!randomitems) 998 if (!randomitems)
999 {
981 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1000 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1001 randomitems = treasurelist::get (shstr_none); // avoid crashes
1002 }
982 } 1003 }
983 else 1004 else
984 randomitems = 0; 1005 randomitems = 0;
985 break; 1006 break;
986 1007
… …
1059 // instance() activates, this should be fixed properly 1080 // instance() activates, this should be fixed properly
1060 op->deactivate (); 1081 op->deactivate ();
1061 1082
1062 if (!op->parse_kv (f)) 1083 if (!op->parse_kv (f))
1063 { 1084 {
1064 op->destroy (true); 1085 op->destroy ();
1065 return 0; 1086 return 0;
1066 } 1087 }
1067 1088
1068 op->post_load_check (); 1089 op->post_load_check ();
1069 return op; 1090 return op;
… …
1285 1306
1286 /* We don't need to worry about the arch's extra fields - they 1307 /* We don't need to worry about the arch's extra fields - they
1287 * will get taken care of the copy_to method. 1308 * will get taken care of the copy_to method.
1288 */ 1309 */
1289 1310
1311 if (op->uuid)
1290 f.put (KW_uuid, op->uuid.c_str ()); 1312 f.put (KW_uuid, op->uuid.c_str ());
1291 1313
1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1314#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1315#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1294 1316
1295 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
… …
1311 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1333 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1334 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1335 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1314 1336
1315 if (op->animation_id != tmp->animation_id) 1337 if (op->animation_id != tmp->animation_id)
1316 if (op->animation_id) 1338 if (op->has_anim ())
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1339 f.put (KW_animation, op->anim ().name);
1318 else 1340 else
1319 { 1341 {
1320 f.put (KW_animation, (const char *)0); 1342 f.put (KW_animation, (const char *)0);
1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1343 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1322 } 1344 }
… …
1379 CMP_OUT (last_grace); 1401 CMP_OUT (last_grace);
1380 CMP_OUT (last_eat); 1402 CMP_OUT (last_eat);
1381 CMP_OUT (glow_radius); 1403 CMP_OUT (glow_radius);
1382 1404
1383 if (op->flag [FLAG_IS_LINKED]) 1405 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op)) 1406 if (auto (ol, op->find_link ()))
1385 f.put (KW_connected, i); 1407 f.put (KW_connected, ol->id);
1386 1408
1387 CMP_OUT (randomitems); 1409 CMP_OUT (randomitems);
1388 CMP_OUT2 (container, weight_limit); 1410 CMP_OUT2 (container, weight_limit);
1389 1411
1390 CMP_OUT (run_away); 1412 CMP_OUT (run_away);
1391 CMP_OUT (pick_up); 1413 CMP_OUT (pick_up);
1392 CMP_OUT (will_apply); 1414 CMP_OUT (will_apply);
1393 CMP_OUT (smoothlevel); 1415 CMP_OUT (smoothlevel);
1394 CMP_OUT (weapontype); 1416 CMP_OUT (weapontype);
1395 CMP_OUT (tooltype);
1396 CMP_OUT (client_type); 1417 CMP_OUT (client_type);
1397 CMP_OUT (item_power); 1418 CMP_OUT (item_power);
1398 CMP_OUT (duration); 1419 CMP_OUT (duration);
1399 CMP_OUT (range); 1420 CMP_OUT (range);
1400 CMP_OUT (range_modifier); 1421 CMP_OUT (range_modifier);
… …
1427 * the only place this is not set is when saving the player. 1448 * the only place this is not set is when saving the player.
1428 */ 1449 */
1429bool 1450bool
1430object::write (object_freezer &f) 1451object::write (object_freezer &f)
1431{ 1452{
1432 archetype *at = arch ? arch : archetype::empty; 1453 if (is_arch ())
1433 1454 {
1455 f.put (KW_object, arch->archname);
1456 write_diff (f, this, archetype::empty);
1457 }
1458 else
1459 {
1434 f.put (KW_arch, at->archname); 1460 f.put (KW_arch, arch->archname);
1435 write_diff (f, this, at); 1461 write_diff (f, this, arch);
1462 }
1436 1463
1437 for (object *tmp = inv; tmp; tmp = tmp->below) 1464 for (object *tmp = inv; tmp; tmp = tmp->below)
1438 tmp->write (f); 1465 tmp->write (f);
1439 1466
1440 f.put (this); 1467 f.put (this);

Diff Legend

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