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.149 by root, Mon Nov 16 22:31:13 2009 UTC vs.
Revision 1.151 by root, Sat Jan 16 13:41:37 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 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 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
… …
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 <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
… …
333 332
334 /* objects now have a materialname. try to patch it in */ 333 /* objects now have a materialname. try to patch it in */
335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 334 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 335 select_material (this, map ? map->difficulty : 5);
337 336
337 if (speed < 0.)
338 {
339 flag [FLAG_RANDOM_SPEED] = true;
340 speed = -speed;
341 // speed_left will be randomised in instantiate () and copy_to ()
342 }
343
338 /* only do these when program is first run - a bit 344 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 345 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 346 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 347 * not in the ideal fashion.
342 */ 348 */
… …
638 644
639 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
640 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
641 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
642 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
643 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
644 651
645 case KW_speed: 652 case KW_speed:
646 f.get (speed); 653 f.get (speed);
647 654
… …
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 923 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
918 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 925 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
921 929
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1246 /* 100 */ 1254 /* 100 */
1247 KW_neutral, 1255 KW_neutral,
1248 KW_no_attack, 1256 KW_no_attack,
1249 KW_no_damage, 1257 KW_no_damage,
1250 KW_obj_original, 1258 KW_obj_original,
1251 KW_NULL, 1259 KW_random_speed,
1252 KW_activate_on_push, 1260 KW_activate_on_push,
1253 KW_activate_on_release, 1261 KW_activate_on_release,
1254 KW_is_water, 1262 KW_is_water,
1255 KW_use_content_on_gen, 1263 KW_use_content_on_gen,
1256 KW_NULL, 1264 KW_NULL,
… …
1303 CMP_OUT (subtype); 1311 CMP_OUT (subtype);
1304 CMP_OUT (direction); 1312 CMP_OUT (direction);
1305 1313
1306 CMP_OUT (name); 1314 CMP_OUT (name);
1307 CMP_OUT (name_pl); 1315 CMP_OUT (name_pl);
1308
1309 CMP_OUT (speed); 1316 CMP_OUT (speed);
1310 1317
1311 // speed_left is a major time-burner, and has good locality, so 1318 // speed_left is a major time-burner, and has good locality, so
1312 // we use a simple lookup-cache to avoid the very slow printf. 1319 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left) 1320 if (op->speed_left != arch->speed_left)
1314 { 1321 {
1315 static double last_speed_left = 0.; 1322 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n"; 1323 static char last_speed_left_str [256] = "sl 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1324 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1318 1325
1319 if (last_speed_left != op->speed_left) 1326 if (last_speed_left != op->speed_left)
1320 { 1327 {
1321 last_speed_left = op->speed_left; 1328 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("speed_left ") - 1 1329 last_speed_left_len = sizeof ("sl ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1330 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1324 } 1331 }
1325 1332
1326 f.add (last_speed_left_str, last_speed_left_len); 1333 f.add (last_speed_left_str, last_speed_left_len);
1327 } 1334 }
1328 1335
… …
1416 if (op->flag [FLAG_IS_LINKED]) 1423 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ())) 1424 if (auto (ol, op->find_link ()))
1418 f.put (KW(connected), ol->id); 1425 f.put (KW(connected), ol->id);
1419 1426
1420 CMP_OUT (randomitems); 1427 CMP_OUT (randomitems);
1428
1421 CMP_OUT2 (container, weight_limit); 1429 CMP_OUT2 (container, weight_limit);
1422 1430
1423 CMP_OUT (run_away); 1431 CMP_OUT (run_away);
1424 CMP_OUT (pick_up); 1432 CMP_OUT (pick_up);
1425 CMP_OUT (will_apply); 1433 CMP_OUT (will_apply);

Diff Legend

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