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.150 by root, Sun Nov 29 09:41:27 2009 UTC

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

Diff Legend

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