| … | |
… | |
| 155 | |
155 | |
| 156 | if (QUERY_FLAG (op, FLAG_WIZ)) |
156 | if (QUERY_FLAG (op, FLAG_WIZ)) |
| 157 | { |
157 | { |
| 158 | new_draw_info_format (NDI_UNIQUE, 0, op, |
158 | new_draw_info_format (NDI_UNIQUE, 0, op, |
| 159 | "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", |
159 | "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", |
| 160 | m->players, m->difficulty, MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m), MAP_TIMEOUT (m)); |
160 | m->players, m->difficulty, m->width, m->height, MAP_ENTER_X (m), MAP_ENTER_Y (m), MAP_TIMEOUT (m)); |
| 161 | |
161 | |
| 162 | } |
162 | } |
| 163 | if (m->msg) |
163 | if (m->msg) |
| 164 | new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); |
164 | new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); |
| 165 | } |
165 | } |
| … | |
… | |
| 1328 | object *tmp; |
1328 | object *tmp; |
| 1329 | |
1329 | |
| 1330 | for (mp = styles; mp != NULL; mp = mp->next) |
1330 | for (mp = styles; mp != NULL; mp = mp->next) |
| 1331 | { |
1331 | { |
| 1332 | maps_used++; |
1332 | maps_used++; |
| 1333 | mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile); |
1333 | mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile); |
| 1334 | for (x = 0; x < MAP_WIDTH (mp); x++) |
1334 | for (x = 0; x < mp->width; x++) |
| 1335 | { |
1335 | { |
| 1336 | for (y = 0; y < MAP_HEIGHT (mp); y++) |
1336 | for (y = 0; y < mp->height; y++) |
| 1337 | { |
1337 | { |
| 1338 | for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above) |
1338 | for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above) |
| 1339 | objects_used++; |
1339 | objects_used++; |
| 1340 | } |
1340 | } |
| 1341 | } |
1341 | } |
