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.180 by root, Wed Nov 14 19:40:44 2018 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>
… …
250 "spell_glyph", /* 205 */ 250 "spell_glyph", /* 205 */
251 NULL 251 NULL
252}; 252};
253 253
254/* This function checks the object after it has been loaded (when we 254/* This function checks the object after it has been loaded (when we
255 * get the 'end' in the input stream). This function can be used to 255 * get the 'end' in the input stream). This function can be used to
256 * deal with legacy objects where fields may have changed. It can also be used 256 * deal with legacy objects where fields may have changed. It can also be used
257 * to check for objects to make sure there are no common errors. 257 * to check for objects to make sure there are no common errors.
258 */ 258 */
259void 259void
260object::post_load_check () 260object::post_load_check ()
… …
293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
294 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
295 } 295 }
296 break; 296 break;
297 297
298 case CONTAINER:
299 if (nrof)
300 {
301 LOG (llevError, "ITEMBUG: %s: stackable container\n", debug_desc ());
302 nrof = 0;
303 }
304 break;
305
298 case PLAYER: 306 case PLAYER:
299 if (slot [body_shield].info != 1) 307 if (slot [body_shield].info != 1)
300 { 308 {
301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 309 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
302 slot [body_shield].info = 1; 310 slot [body_shield].info = 1;
… …
321 * this isn't perfect (things won't be properly pluralised), but works to 329 * this isn't perfect (things won't be properly pluralised), but works to
322 * that degree (5 heart is still quite understandable). But the case we 330 * that degree (5 heart is still quite understandable). But the case we
323 * also have to catch is if this object is not using the normal name for 331 * also have to catch is if this object is not using the normal name for
324 * the object. In that case, we also want to use the loaded name. 332 * the object. In that case, we also want to use the loaded name.
325 * Otherwise, what happens is that the the plural name will lose 333 * Otherwise, what happens is that the the plural name will lose
326 * information (appear as just 'hearts' and not 'goblins heart') 334 * information (appear as just 'hearts' and not 'goblins heart')
327 */ 335 */
328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl) 336 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
329 name_pl = 0; 337 name_pl = 0;
330 338
331 if (!name_pl) 339 if (!name_pl)
… …
475 } 483 }
476 484
477 // if the object has an animation, try to provide a default face 485 // if the object has an animation, try to provide a default face
478 if (has_anim ()) 486 if (has_anim ())
479 { 487 {
480 const animation &anim_ob = anim ();
481
482 if (anim_speed) 488 if (anim_speed)
483 // if this item is time-animated, force the last frame 489 // if this item is time-animated, force the last frame
484 animate_object (this, 0); 490 animate_object (this, 0);
485 else if (flag [FLAG_MONSTER]) 491 else if (flag [FLAG_MONSTER])
486 // if it is a monster, set appropriate facing 492 // if it is a monster, set appropriate facing
… …
550 556
551bool 557bool
552object::parse_kv (object_thawer &f) 558object::parse_kv (object_thawer &f)
553{ 559{
554 object *op_inv = inv; 560 object *op_inv = inv;
555 key_value *last_kv = kv.first;
556 561
557 for (;;) 562 for (;;)
558 { 563 {
559 switch (f.kw) 564 switch (f.kw)
560 { 565 {
… …
633 f.delayed_deref (this, owner, f.get_str ()); 638 f.delayed_deref (this, owner, f.get_str ());
634 break; 639 break;
635 640
636 case KW_animation: 641 case KW_animation:
637 { 642 {
638 this->clr_flag (FLAG_ANIMATE); 643 clr_flag (FLAG_ANIMATE);
639 animation_id = 0; 644 animation_id = 0;
640 645
641 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 646 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 647 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
643 } 648 }
644 break; 649 break;
645 650
646 case KW_last_heal: f.get (last_heal); break; 651 case KW_last_heal: f.get (last_heal); break;
647 case KW_last_sp: f.get (last_sp); break; 652 case KW_last_sp: f.get (last_sp); break;
… …
793 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 798 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
794 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 799 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
795 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 800 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
796 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 801 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
797 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 802 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
803 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
798 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 804 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
799 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 805 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
800 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 806 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
801 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 807 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
802 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 808 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
1067 KW_NULL, 1073 KW_NULL,
1068 KW_applied, 1074 KW_applied,
1069 KW_unpaid, 1075 KW_unpaid,
1070 KW_can_use_shield, 1076 KW_can_use_shield,
1071 KW_no_pick, 1077 KW_no_pick,
1072 KW_NULL, // walk_on 1078 KW_is_transparent_floor,
1073 /* 10 */ 1079 /* 10 */
1074 KW_NULL, // no_pass 1080 KW_NULL, // no_pass
1075 KW_is_animated, 1081 KW_is_animated,
1076 KW_NULL, // slow_move 1082 KW_NULL, // slow_move
1077 KW_NULL, // flying 1083 KW_NULL, // flying
… …
1242 static int last_speed_left_len = sizeof ("sl 0\n") - 1; 1248 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1243 1249
1244 if (last_speed_left != op->speed_left) 1250 if (last_speed_left != op->speed_left)
1245 { 1251 {
1246 last_speed_left = op->speed_left; 1252 last_speed_left = op->speed_left;
1253 // .7g loses precision even for float, but gives nice round numbers and smaller files
1254 // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
1255 // (printf is typically very slow)
1247 last_speed_left_len = sizeof ("sl ") - 1 1256 last_speed_left_len = sizeof ("sl ") - 1
1248 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); 1257 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1249 } 1258 }
1250 1259
1251 f.add (last_speed_left_str, last_speed_left_len); 1260 f.add (last_speed_left_str, last_speed_left_len);

Diff Legend

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