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.25 by root, Mon Dec 18 03:00:02 2006 UTC vs.
Revision 1.28 by root, Mon Dec 25 11:25:49 2006 UTC

… …
487 SET_FLAG (op, flag); \ 487 SET_FLAG (op, flag); \
488 else \ 488 else \
489 CLEAR_FLAG (op, flag) \ 489 CLEAR_FLAG (op, flag) \
490 490
491int 491int
492parse_object (object *op, object_thawer & thawer, int map_flags) 492parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 493{
494 bool ismore = 0; 494 bool ismore = 0;
495 object *op_inv = op->inv; 495 object *op_inv = op->inv;
496 496
497 for (;;) 497 for (;;)
… …
502 { 502 {
503 case KW_Object: // uppercase alias 503 case KW_Object: // uppercase alias
504 case KW_object: 504 case KW_object:
505 thawer.get (op->name); 505 thawer.get (op->name);
506 506
507 if (op->arch != NULL) 507 if (op->arch)
508 op->arch->name = op->name; 508 op->arch->name = op->name;
509 509
510 break; 510 break;
511 511
512 case KW_uuid: 512 case KW_uuid:
… …
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 831 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 832 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 833 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 834 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset. 1063 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 * 1065 *
1067 */ 1066 */
1068
1069int 1067int
1070load_object (object_thawer & fp, object *op, int map_flags) 1068load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1069{
1072 return parse_object (op, fp, map_flags); 1070 return parse_object (op, fp, map_flags);
1073} 1071}
1074
1075 1072
1076/* This takes a buffer, scans it for variables, and sets those variables 1073/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1074 * as appropriate in op.
1078 * 1075 *
1079 * This function appears to be used in only 2 places - in crossedit to 1076 * This function appears to be used in only 2 places - in crossedit to
… …
1182 KW_monster, 1179 KW_monster,
1183 KW_friendly, 1180 KW_friendly,
1184 KW_generator, 1181 KW_generator,
1185 KW_is_thrown, 1182 KW_is_thrown,
1186 KW_auto_apply, 1183 KW_auto_apply,
1187 KW_treasure, 1184 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1185 KW_player_sold,
1189 /* 20 */ 1186 /* 20 */
1190 KW_see_invisible, 1187 KW_see_invisible,
1191 KW_can_roll, 1188 KW_can_roll,
1192 KW_overlay_floor, 1189 KW_overlay_floor,
… …
1429 CMP_OUT (move_on); 1426 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1427 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1428 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1429 CMP_OUT (move_slow_penalty);
1433 1430
1434 if (op->flags != tmp->flags) 1431 if (op->flag != tmp->flag)
1435 for (i = 0; i <= NUM_FLAGS; i++) 1432 for (i = 0; i <= NUM_FLAGS; i++)
1436 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1433 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1434 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1435
1439 /* Save body locations */ 1436 /* Save body locations */
1440 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1437 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (op->body_info[i] != tmp->body_info[i]) 1438 if (op->body_info[i] != tmp->body_info[i])
1442 f.put (body_locations[i].save_name, op->body_info[i]); 1439 f.put (body_locations[i].save_name, op->body_info[i]);

Diff Legend

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