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.174 by root, Fri Feb 3 02:04:11 2012 UTC vs.
Revision 1.182 by root, Wed Nov 14 21:19:41 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * 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 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * 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 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <sproto.h> 27#include <sproto.h>
… …
250 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
251 NULL 252 NULL
252}; 253};
253 254
254/* This function checks the object after it has been loaded (when we 255/* 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 256 * 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 257 * 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. 258 * to check for objects to make sure there are no common errors.
258 */ 259 */
259void 260void
260object::post_load_check () 261object::post_load_check ()
… …
293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 294 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
294 slot [body_shield].info = -1; 295 slot [body_shield].info = -1;
295 } 296 }
296 break; 297 break;
297 298
299 case CONTAINER:
300 if (nrof)
301 {
302 LOG (llevError, "ITEMBUG: %s: stackable container (nrof %d)\n", debug_desc (), (int)nrof);
303 nrof = 0;
304 }
305 break;
306
298 case PLAYER: 307 case PLAYER:
299 if (slot [body_shield].info != 1) 308 if (slot [body_shield].info != 1)
300 { 309 {
301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 310 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
302 slot [body_shield].info = 1; 311 slot [body_shield].info = 1;
… …
321 * this isn't perfect (things won't be properly pluralised), but works to 330 * 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 331 * 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 332 * 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. 333 * 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 334 * Otherwise, what happens is that the the plural name will lose
326 * information (appear as just 'hearts' and not 'goblins heart') 335 * information (appear as just 'hearts' and not 'goblins heart')
327 */ 336 */
328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl) 337 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
329 name_pl = 0; 338 name_pl = 0;
330 339
331 if (!name_pl) 340 if (!name_pl)
… …
630 f.delayed_deref (this, owner, f.get_str ()); 639 f.delayed_deref (this, owner, f.get_str ());
631 break; 640 break;
632 641
633 case KW_animation: 642 case KW_animation:
634 { 643 {
635 this->clr_flag (FLAG_ANIMATE); 644 clr_flag (FLAG_ANIMATE);
636 animation_id = 0; 645 animation_id = 0;
637 646
638 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 647 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
639 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here 648 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
640 } 649 }
641 break; 650 break;
642 651
643 case KW_last_heal: f.get (last_heal); break; 652 case KW_last_heal: f.get (last_heal); break;
644 case KW_last_sp: f.get (last_sp); break; 653 case KW_last_sp: f.get (last_sp); break;
… …
1240 static int last_speed_left_len = sizeof ("sl 0\n") - 1; 1249 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1241 1250
1242 if (last_speed_left != op->speed_left) 1251 if (last_speed_left != op->speed_left)
1243 { 1252 {
1244 last_speed_left = op->speed_left; 1253 last_speed_left = op->speed_left;
1254 // .7g loses precision even for float, but gives nice round numbers and smaller files
1255 // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
1256 // (printf is typically very slow)
1245 last_speed_left_len = sizeof ("sl ") - 1 1257 last_speed_left_len = sizeof ("sl ") - 1
1246 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); 1258 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1247 } 1259 }
1248 1260
1249 f.add (last_speed_left_str, last_speed_left_len); 1261 f.add (last_speed_left_str, last_speed_left_len);

Diff Legend

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