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.170 by root, Sat May 7 17:14:41 2011 UTC vs.
Revision 1.177 by root, Wed Nov 16 23:41:59 2016 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
… …
475 } 475 }
476 476
477 // if the object has an animation, try to provide a default face 477 // if the object has an animation, try to provide a default face
478 if (has_anim ()) 478 if (has_anim ())
479 { 479 {
480 const animation &anim_ob = anim ();
481
482 if (anim_speed) 480 if (anim_speed)
483 // if this item is time-animated, force the last frame 481 // if this item is time-animated, force the last frame
484 animate_object (this, 0); 482 animate_object (this, 0);
485 else if (flag [FLAG_MONSTER]) 483 else if (flag [FLAG_MONSTER])
486 // if it is a monster, set appropriate facing 484 // if it is a monster, set appropriate facing
… …
550 548
551bool 549bool
552object::parse_kv (object_thawer &f) 550object::parse_kv (object_thawer &f)
553{ 551{
554 object *op_inv = inv; 552 object *op_inv = inv;
555 key_value *last_kv = kv.first;
556 553
557 for (;;) 554 for (;;)
558 { 555 {
559 switch (f.kw) 556 switch (f.kw)
560 { 557 {
… …
633 f.delayed_deref (this, owner, f.get_str ()); 630 f.delayed_deref (this, owner, f.get_str ());
634 break; 631 break;
635 632
636 case KW_animation: 633 case KW_animation:
637 { 634 {
638 this->clr_flag (FLAG_ANIMATE); 635 clr_flag (FLAG_ANIMATE);
639 animation_id = 0; 636 animation_id = 0;
640 637
641 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 638 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
642 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here 639 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
643 } 640 }
644 break; 641 break;
645 642
646 case KW_last_heal: f.get (last_heal); break; 643 case KW_last_heal: f.get (last_heal); break;
647 case KW_last_sp: f.get (last_sp); break; 644 case KW_last_sp: f.get (last_sp); break;
… …
793 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 790 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
794 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 791 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
795 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 792 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
796 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 793 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
797 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 794 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
795 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
798 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 796 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
799 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 797 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
800 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 798 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
801 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 799 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
802 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 800 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
1067 KW_NULL, 1065 KW_NULL,
1068 KW_applied, 1066 KW_applied,
1069 KW_unpaid, 1067 KW_unpaid,
1070 KW_can_use_shield, 1068 KW_can_use_shield,
1071 KW_no_pick, 1069 KW_no_pick,
1072 KW_NULL, // walk_on 1070 KW_is_transparent_floor,
1073 /* 10 */ 1071 /* 10 */
1074 KW_NULL, // no_pass 1072 KW_NULL, // no_pass
1075 KW_is_animated, 1073 KW_is_animated,
1076 KW_NULL, // slow_move 1074 KW_NULL, // slow_move
1077 KW_NULL, // flying 1075 KW_NULL, // flying

Diff Legend

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