| … | |
… | |
| 557 | parse_object (tmp, thawer, map_flags); |
557 | parse_object (tmp, thawer, map_flags); |
| 558 | |
558 | |
| 559 | if (tmp->arch) |
559 | if (tmp->arch) |
| 560 | { |
560 | { |
| 561 | // was: insert_ob_in_ob (tmp, op); |
561 | // was: insert_ob_in_ob (tmp, op); |
| 562 | // but manually addint it can improve map loading times a lot |
562 | // but manually adding it can improve map loading times a lot |
|
|
563 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
564 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
| 563 | tmp->env = op; |
565 | tmp->env = op; |
| 564 | |
566 | |
| 565 | if (!op->inv) |
567 | if (!op->inv) |
| 566 | op->inv = tmp; |
568 | op->inv = tmp; |
| 567 | else |
569 | else |
| … | |
… | |
| 1021 | thawer.line += strlen (thawer.line) + 1; |
1023 | thawer.line += strlen (thawer.line) + 1; |
| 1022 | |
1024 | |
| 1023 | break; |
1025 | break; |
| 1024 | |
1026 | |
| 1025 | default: |
1027 | default: |
| 1026 | printf ("kw abort %s\n", keyword_str [kw]);//D |
1028 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]); |
| 1027 | abort (); |
1029 | break; |
| 1028 | } |
1030 | } |
| 1029 | } |
1031 | } |
| 1030 | } |
1032 | } |
| 1031 | |
1033 | |
| 1032 | /* |
1034 | /* |
| … | |
… | |
| 1053 | * as appropriate in op. |
1055 | * as appropriate in op. |
| 1054 | * |
1056 | * |
| 1055 | * This function appears to be used in only 2 places - in crossedit to |
1057 | * This function appears to be used in only 2 places - in crossedit to |
| 1056 | * override values and in c_wiz to mutate values. |
1058 | * override values and in c_wiz to mutate values. |
| 1057 | */ |
1059 | */ |
|
|
1060 | int |
| 1058 | int set_variable(object *op,char *buf) { |
1061 | set_variable(object *op, char *buf) |
|
|
1062 | { |
|
|
1063 | return 0; |
| 1059 | #if 0 |
1064 | #if 0 |
| 1060 | int retval; |
1065 | int retval; |
| 1061 | object_thawer thawer (0); |
1066 | object_thawer thawer (0); |
| 1062 | |
1067 | |
| 1063 | strcpy(msgbuf, ""); |
1068 | strcpy(msgbuf, ""); |
| … | |
… | |
| 1120 | |
1125 | |
| 1121 | void init_vars() { |
1126 | void init_vars() { |
| 1122 | } |
1127 | } |
| 1123 | |
1128 | |
| 1124 | /* This returns a string of the integer movement type */ |
1129 | /* This returns a string of the integer movement type */ |
|
|
1130 | #if 0 |
|
|
1131 | // unused function |
| 1125 | static char* get_string_move_type(MoveType mt) |
1132 | static char* get_string_move_type(MoveType mt) |
| 1126 | { |
1133 | { |
| 1127 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
1134 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
| 1128 | int i, all_count=0, count; |
1135 | int i, all_count=0, count; |
| 1129 | |
1136 | |
| … | |
… | |
| 1157 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
1164 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
| 1158 | */ |
1165 | */ |
| 1159 | if (all_count <=1) return retbuf_all+1; |
1166 | if (all_count <=1) return retbuf_all+1; |
| 1160 | else return retbuf+1; |
1167 | else return retbuf+1; |
| 1161 | } |
1168 | } |
| 1162 | |
1169 | #endif |
|
|
1170 | |
| 1163 | // compare *op against *tmp and output differences |
1171 | // compare *op against *tmp and output differences |
| 1164 | void |
1172 | void |
| 1165 | put (object_freezer &f, object *op, object *tmp) |
1173 | put (object_freezer &f, object *op, object *tmp) |
| 1166 | { |
1174 | { |
| 1167 | int i; |
1175 | int i; |
