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.126 by root, Thu Jan 1 11:41:17 2009 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>
461 } 462 }
462 else 463 else
463 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
464 } 465 }
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);
479 }
466} 480}
467 481
468static void 482static void
469set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
470{ 484{
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_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
936 950
937 // elevation is deprecated 951 // elevation is deprecated
963 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;
964 case KW_can_apply: 978 case KW_can_apply:
965 break; 979 break;
966 980
967 case KW_connected: 981 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
969 break; 988 break;
970 989
971 case KW_randomitems: 990 case KW_randomitems:
972 if (f.get_str ()) 991 if (f.get_str ())
973 { 992 {
975 loading_arch 994 loading_arch
976 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
977 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
978 997
979 if (!randomitems) 998 if (!randomitems)
999 {
980 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 }
981 } 1003 }
982 else 1004 else
983 randomitems = 0; 1005 randomitems = 0;
984 break; 1006 break;
985 1007
1284 1306
1285 /* 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
1286 * will get taken care of the copy_to method. 1308 * will get taken care of the copy_to method.
1287 */ 1309 */
1288 1310
1311 if (op->uuid)
1289 f.put (KW_uuid, op->uuid.c_str ()); 1312 f.put (KW_uuid, op->uuid.c_str ());
1290 1313
1291#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)
1292#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)
1293 1316
1294 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
1310 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);
1311 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);
1312 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);
1313 1336
1314 if (op->animation_id != tmp->animation_id) 1337 if (op->animation_id != tmp->animation_id)
1315 if (op->animation_id) 1338 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1339 f.put (KW_animation, op->anim ().name);
1317 else 1340 else
1318 { 1341 {
1319 f.put (KW_animation, (const char *)0); 1342 f.put (KW_animation, (const char *)0);
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1343 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1344 }
1378 CMP_OUT (last_grace); 1401 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1402 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1403 CMP_OUT (glow_radius);
1381 1404
1382 if (op->flag [FLAG_IS_LINKED]) 1405 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1406 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1407 f.put (KW_connected, ol->id);
1385 1408
1386 CMP_OUT (randomitems); 1409 CMP_OUT (randomitems);
1387 CMP_OUT2 (container, weight_limit); 1410 CMP_OUT2 (container, weight_limit);
1388 1411
1389 CMP_OUT (run_away); 1412 CMP_OUT (run_away);
1425 * 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.
1426 */ 1449 */
1427bool 1450bool
1428object::write (object_freezer &f) 1451object::write (object_freezer &f)
1429{ 1452{
1430 archetype *at = arch ? arch : archetype::empty; 1453 if (is_arch ())
1431 1454 {
1455 f.put (KW_object, arch->archname);
1456 write_diff (f, this, archetype::empty);
1457 }
1458 else
1459 {
1432 f.put (KW_arch, at->archname); 1460 f.put (KW_arch, arch->archname);
1433 write_diff (f, this, at); 1461 write_diff (f, this, arch);
1462 }
1434 1463
1435 for (object *tmp = inv; tmp; tmp = tmp->below) 1464 for (object *tmp = inv; tmp; tmp = tmp->below)
1436 tmp->write (f); 1465 tmp->write (f);
1437 1466
1438 f.put (this); 1467 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines