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.177 by root, Wed Nov 16 23:41:59 2016 UTC vs.
Revision 1.180 by root, Wed Nov 14 19:40:44 2018 UTC

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)
1240 static int last_speed_left_len = sizeof ("sl 0\n") - 1; 1248 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1241 1249
1242 if (last_speed_left != op->speed_left) 1250 if (last_speed_left != op->speed_left)
1243 { 1251 {
1244 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)
1245 last_speed_left_len = sizeof ("sl ") - 1 1256 last_speed_left_len = sizeof ("sl ") - 1
1246 + 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);
1247 } 1258 }
1248 1259
1249 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