ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.3 by elmex, Tue Aug 15 17:35:50 2006 UTC vs.
Revision 1.39 by root, Tue Dec 12 20:53:02 2006 UTC

1/*
2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.3 2006/08/15 17:35:50 elmex Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
28 23
29 24
30#include <global.h> 25#include <global.h>
31#include <funcpoint.h> 26#include <funcpoint.h>
32 27
33#include <loader.h> 28#include <loader.h>
34#ifndef WIN32 /* ---win32 exclude header */
35#include <unistd.h> 29#include <unistd.h>
36#endif /* win32 */
37 30
38#include "path.h" 31#include "path.h"
39 32
40 33
41extern int nrofallocobjects,nroffreeobjects;
42
43void (*load_original_map_callback)(mapstruct *map);
44void (*load_temporary_map_callback)(mapstruct *map);
45void (*clean_temporary_map_callback)(mapstruct *map);
46
47/* 34/*
48 * Returns the mapstruct which has a name matching the given argument. 35 * Returns the maptile which has a name matching the given argument.
49 * return NULL if no match is found. 36 * return NULL if no match is found.
50 */ 37 */
51 38
39maptile *
52mapstruct *has_been_loaded (const char *name) { 40has_been_loaded (const char *name)
53 mapstruct *map; 41{
42 maptile *map;
54 43
55 if (!name || !*name) 44 if (!name || !*name)
56 return 0; 45 return 0;
57 for (map = first_map; map; map = map->next) 46 for (map = first_map; map; map = map->next)
58 if (!strcmp (name, map->path)) 47 if (!strcmp (name, map->path))
59 break; 48 break;
60 return (map); 49 return (map);
61} 50}
62 51
63/* 52/*
64 * This makes a path absolute outside the world of Crossfire. 53 * This makes a path absolute outside the world of Crossfire.
65 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 54 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
66 * and returns the pointer to a static array containing the result. 55 * and returns the pointer to a static array containing the result.
67 * it really should be called create_mapname 56 * it really should be called create_mapname
68 */ 57 */
69 58
59const char *
70const char *create_pathname (const char *name) { 60create_pathname (const char *name)
61{
71 static char buf[MAX_BUF]; 62 static char buf[MAX_BUF];
72 63
73 /* Why? having extra / doesn't confuse unix anyplace? Dependancies 64 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
74 * someplace else in the code? msw 2-17-97 65 * someplace else in the code? msw 2-17-97
75 */ 66 */
76 if (*name == '/') 67 if (*name == '/')
77 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name); 68 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
78 else 69 else
79 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 70 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);
80 return (buf); 71 return (buf);
81} 72}
82 73
83/* 74/*
84 * same as create_pathname, but for the overlay maps. 75 * same as create_pathname, but for the overlay maps.
85 */ 76 */
86 77
78const char *
87const char *create_overlay_pathname (const char *name) { 79create_overlay_pathname (const char *name)
80{
88 static char buf[MAX_BUF]; 81 static char buf[MAX_BUF];
89 82
90 /* Why? having extra / doesn't confuse unix anyplace? Dependancies 83 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
91 * someplace else in the code? msw 2-17-97 84 * someplace else in the code? msw 2-17-97
92 */ 85 */
93 if (*name == '/') 86 if (*name == '/')
94 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name); 87 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
95 else 88 else
96 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name); 89 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
97 return (buf); 90 return (buf);
98} 91}
99 92
100/* 93/*
101 * same as create_pathname, but for the template maps. 94 * same as create_pathname, but for the template maps.
102 */ 95 */
103 96
97const char *
104const char *create_template_pathname (const char *name) { 98create_template_pathname (const char *name)
99{
105 static char buf[MAX_BUF]; 100 static char buf[MAX_BUF];
106 101
107 /* Why? having extra / doesn't confuse unix anyplace? Dependancies 102 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
108 * someplace else in the code? msw 2-17-97 103 * someplace else in the code? msw 2-17-97
109 */ 104 */
110 if (*name == '/') 105 if (*name == '/')
111 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name); 106 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
112 else 107 else
113 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name); 108 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
114 return (buf); 109 return (buf);
115} 110}
116 111
117/* 112/*
118 * This makes absolute path to the itemfile where unique objects 113 * This makes absolute path to the itemfile where unique objects
119 * will be saved. Converts '/' to '@'. I think it's essier maintain 114 * will be saved. Converts '/' to '@'. I think it's essier maintain
120 * files than full directory structure, but if this is problem it can 115 * files than full directory structure, but if this is problem it can
121 * be changed. 116 * be changed.
122 */ 117 */
118static const char *
123static const char *create_items_path (const char *s) { 119create_items_path (const char *s)
120{
124 static char buf[MAX_BUF]; 121 static char buf[MAX_BUF];
125 char *t; 122 char *t;
126 123
124 if (*s == '/')
125 s++;
126
127 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
128
129 for (t = buf + strlen (buf); *s; s++, t++)
127 if (*s == '/') 130 if (*s == '/')
128 s++;
129
130 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
131
132 for (t=buf+strlen(buf); *s; s++,t++)
133 if (*s == '/')
134 *t = '@'; 131 *t = '@';
135 else 132 else
136 *t = *s; 133 *t = *s;
137 *t = 0; 134 *t = 0;
138 return (buf); 135 return (buf);
139} 136}
140 137
141 138
142/* 139/*
143 * This function checks if a file with the given path exists. 140 * This function checks if a file with the given path exists.
… …
153 * when the editor goes away, the call to stat should probably be 150 * when the editor goes away, the call to stat should probably be
154 * replaced by an access instead (similar to the windows one, but 151 * replaced by an access instead (similar to the windows one, but
155 * that seems to be missing the prepend_dir processing 152 * that seems to be missing the prepend_dir processing
156 */ 153 */
157 154
155int
158int check_path (const char *name, int prepend_dir) 156check_path (const char *name, int prepend_dir)
159{ 157{
160 char buf[MAX_BUF]; 158 char buf[MAX_BUF];
161#ifndef WIN32 159
162 char *endbuf; 160 char *endbuf;
163 struct stat statbuf; 161 struct stat statbuf;
164 int mode = 0, i; 162 int mode = 0;
165#endif
166 163
167 if (prepend_dir) 164 if (prepend_dir)
168 strcpy (buf, create_pathname(name)); 165 strcpy (buf, create_pathname (name));
169 else 166 else
170 strcpy(buf, name); 167 strcpy (buf, name);
171#ifdef WIN32 /* ***win32: check this sucker in windows style. */
172 return(_access(buf,0));
173#else
174 168
175 /* old method (strchr(buf, '\0')) seemd very odd to me - 169 /* old method (strchr(buf, '\0')) seemd very odd to me -
176 * this method should be equivalant and is clearer. 170 * this method should be equivalant and is clearer.
177 * Can not use strcat because we need to cycle through 171 * Can not use strcat because we need to cycle through
178 * all the names. 172 * all the names.
179 */ 173 */
180 endbuf = buf + strlen(buf); 174 endbuf = buf + strlen (buf);
181 175
182 for (i = 0; i < NROF_COMPRESS_METHODS; i++) {
183 if (uncomp[i][0])
184 strcpy(endbuf, uncomp[i][0]);
185 else
186 *endbuf = '\0';
187 if (!stat (buf, &statbuf)) 176 if (stat (buf, &statbuf))
188 break;
189 }
190 if (i == NROF_COMPRESS_METHODS)
191 return (-1); 177 return -1;
192 if (!S_ISREG (statbuf.st_mode)) 178 if (!S_ISREG (statbuf.st_mode))
193 return (-1); 179 return (-1);
194 180
195 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) || 181 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
196 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) || 182 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
197 (statbuf.st_mode & S_IROTH))
198 mode |= 4; 183 mode |= 4;
199 184
200 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) || 185 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
201 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) || 186 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
202 (statbuf.st_mode & S_IWOTH))
203 mode |= 2; 187 mode |= 2;
204 188
205 return (mode); 189 return (mode);
206#endif
207} 190}
208 191
209/* 192/*
210 * Prints out debug-information about a map. 193 * Prints out debug-information about a map.
211 * Dumping these at llevError doesn't seem right, but is 194 * Dumping these at llevError doesn't seem right, but is
212 * necessary to make sure the information is in fact logged. 195 * necessary to make sure the information is in fact logged.
213 */ 196 */
214 197
215void dump_map(const mapstruct *m) { 198void
199dump_map (const maptile *m)
200{
216 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory); 201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
217 LOG(llevError,"Size: %dx%d Start: %d,%d\n", 202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m));
218 MAP_WIDTH(m), MAP_HEIGHT(m),
219 MAP_ENTER_X(m), MAP_ENTER_Y(m));
220 203
221 if(m->msg!=NULL) 204 if (m->msg != NULL)
222 LOG(llevError,"Message:\n%s",m->msg); 205 LOG (llevError, "Message:\n%s", m->msg);
223 206
224 if(m->maplore!=NULL) 207 if (m->maplore != NULL)
225 LOG(llevError,"Lore:\n%s",m->maplore); 208 LOG (llevError, "Lore:\n%s", m->maplore);
226 209
227 if(m->tmpname!=NULL) 210 if (m->tmpname != NULL)
228 LOG(llevError,"Tmpname: %s\n",m->tmpname); 211 LOG (llevError, "Tmpname: %s\n", m->tmpname);
229 212
230 LOG(llevError,"Difficulty: %d\n",m->difficulty); 213 LOG (llevError, "Difficulty: %d\n", m->difficulty);
231 LOG(llevError,"Darkness: %d\n",m->darkness); 214 LOG (llevError, "Darkness: %d\n", m->darkness);
232} 215}
233 216
234/* 217/*
235 * Prints out debug-information about all maps. 218 * Prints out debug-information about all maps.
236 * This basically just goes through all the maps and calls 219 * This basically just goes through all the maps and calls
237 * dump_map on each one. 220 * dump_map on each one.
238 */ 221 */
239 222
223void
240void dump_all_maps(void) { 224dump_all_maps (void)
241 mapstruct *m; 225{
226 maptile *m;
227
242 for(m=first_map;m!=NULL;m=m->next) { 228 for (m = first_map; m != NULL; m = m->next)
229 {
243 dump_map(m); 230 dump_map (m);
244 } 231 }
245} 232}
246 233
247/* This rolls up wall, blocks_magic, blocks_view, etc, all into 234/* This rolls up wall, blocks_magic, blocks_view, etc, all into
248 * one function that just returns a P_.. value (see map.h) 235 * one function that just returns a P_.. value (see map.h)
249 * it will also do map translation for tiled maps, returning 236 * it will also do map translation for tiled maps, returning
… …
252 * by a P_NEW_MAP value, another call to get_map_from_coord 239 * by a P_NEW_MAP value, another call to get_map_from_coord
253 * is needed. The case of not passing values is if we're just 240 * is needed. The case of not passing values is if we're just
254 * checking for the existence of something on those spaces, but 241 * checking for the existence of something on those spaces, but
255 * don't expect to insert/remove anything from those spaces. 242 * don't expect to insert/remove anything from those spaces.
256 */ 243 */
244int
257int get_map_flags(mapstruct *oldmap, mapstruct **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny)
258{ 246{
259 sint16 newx, newy; 247 sint16 newx, newy;
260 int retval=0; 248 int retval = 0;
261 mapstruct *mp; 249 maptile *mp;
262 250
263 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP; 251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
264 newx = x; 253 newx = x;
265 newy = y; 254 newy = y;
266 mp = get_map_from_coord(oldmap, &newx, &newy); 255 mp = get_map_from_coord (oldmap, &newx, &newy);
267 if (mp != oldmap) 256 if (mp != oldmap)
268 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
269 if (newmap) *newmap = mp; 258 if (newmap)
259 *newmap = mp;
260 if (nx)
270 if (nx) *nx = newx; 261 *nx = newx;
262 if (ny)
271 if (ny) *ny = newy; 263 *ny = newy;
264
272 retval |= mp->spaces[newx + mp->width * newy].flags; 265 retval |= mp->spaces[newx + mp->width * newy].flags;
273 266
274 if (retval & P_SAFE)
275 retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
276
277 return retval; 267 return retval;
278} 268}
279
280 269
281/* 270/*
282 * Returns true if the given coordinate is blocked except by the 271 * Returns true if the given coordinate is blocked except by the
283 * object passed is not blocking. This is used with 272 * object passed is not blocking. This is used with
284 * multipart monsters - if we want to see if a 2x2 monster 273 * multipart monsters - if we want to see if a 2x2 monster
… …
288 * monster. 277 * monster.
289 * m, x, y are the target map/coordinates - needed for map tiling. 278 * m, x, y are the target map/coordinates - needed for map tiling.
290 * the coordinates & map passed in should have been updated for tiling 279 * the coordinates & map passed in should have been updated for tiling
291 * by the caller. 280 * by the caller.
292 */ 281 */
293 282int
294int blocked_link(object *ob, mapstruct *m, int sx, int sy) { 283blocked_link (object *ob, maptile *m, int sx, int sy)
284{
295 object *tmp; 285 object *tmp;
296 int mflags, blocked; 286 int mflags, blocked;
297 287
298 /* Make sure the coordinates are valid - they should be, as caller should 288 /* Make sure the coordinates are valid - they should be, as caller should
299 * have already checked this. 289 * have already checked this.
300 */ 290 */
301 if (OUT_OF_REAL_MAP(m, sx, sy)) { 291 if (OUT_OF_REAL_MAP (m, sx, sy))
292 {
302 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n"); 293 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
303 return 1; 294 return 1;
304 } 295 }
305 296
306 /* Save some cycles - instead of calling get_map_flags(), just get the value 297 /* Save some cycles - instead of calling get_map_flags(), just get the value
307 * directly. 298 * directly.
308 */ 299 */
309 mflags = m->spaces[sx + m->width * sy].flags; 300 mflags = m->spaces[sx + m->width * sy].flags;
310 301
311 blocked = GET_MAP_MOVE_BLOCK(m, sx, sy); 302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
312 303
313 /* If space is currently not blocked by anything, no need to 304 /* If space is currently not blocked by anything, no need to
314 * go further. Not true for players - all sorts of special 305 * go further. Not true for players - all sorts of special
315 * things we need to do for players. 306 * things we need to do for players.
316 */ 307 */
317 if (ob->type != PLAYER && ! (mflags & P_IS_ALIVE) && (blocked==0)) return 0; 308 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
318
319 /* if there isn't anytyhing alive on this space, and this space isn't
320 * otherwise blocked, we can return now. Only if there is a living
321 * creature do we need to investigate if it is part of this creature
322 * or another. Likewise, only if something is blocking us do we
323 * need to investigate if there is a special circumstance that would
324 * let the player through (inventory checkers for example)
325 */
326 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0;
327
328 if(ob->head != NULL)
329 ob=ob->head;
330
331 /* We basically go through the stack of objects, and if there is
332 * some other object that has NO_PASS or FLAG_ALIVE set, return
333 * true. If we get through the entire stack, that must mean
334 * ob is blocking it, so return 0.
335 */
336 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) {
337
338 /* This must be before the checks below. Code for inventory checkers. */
339 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) {
340 /* If last_sp is set, the player/monster needs an object,
341 * so we check for it. If they don't have it, they can't
342 * pass through this space.
343 */
344 if (tmp->last_sp) {
345 if (check_inv_recursive(ob,tmp)==NULL)
346 return 1;
347 else
348 continue;
349 } else {
350 /* In this case, the player must not have the object -
351 * if they do, they can't pass through.
352 */
353 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */
354 return 1;
355 else
356 continue;
357 }
358 } /* if check_inv */
359 else {
360 /* Broke apart a big nasty if into several here to make
361 * this more readable. first check - if the space blocks
362 * movement, can't move here.
363 * second - if a monster, can't move there, unles it is a
364 * hidden dm
365 */
366 if (OB_MOVE_BLOCK(ob, tmp)) return 1;
367 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
368 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden))
369 return 1;
370 }
371
372 }
373 return 0; 309 return 0;
310
311 /* if there isn't anytyhing alive on this space, and this space isn't
312 * otherwise blocked, we can return now. Only if there is a living
313 * creature do we need to investigate if it is part of this creature
314 * or another. Likewise, only if something is blocking us do we
315 * need to investigate if there is a special circumstance that would
316 * let the player through (inventory checkers for example)
317 */
318 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
319 return 0;
320
321 if (ob->head != NULL)
322 ob = ob->head;
323
324 /* We basically go through the stack of objects, and if there is
325 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0.
328 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above)
330 {
331
332 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 {
335 /* If last_sp is set, the player/monster needs an object,
336 * so we check for it. If they don't have it, they can't
337 * pass through this space.
338 */
339 if (tmp->last_sp)
340 {
341 if (check_inv_recursive (ob, tmp) == NULL)
342 return 1;
343 else
344 continue;
345 }
346 else
347 {
348 /* In this case, the player must not have the object -
349 * if they do, they can't pass through.
350 */
351 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
352 return 1;
353 else
354 continue;
355 }
356 } /* if check_inv */
357 else
358 {
359 /* Broke apart a big nasty if into several here to make
360 * this more readable. first check - if the space blocks
361 * movement, can't move here.
362 * second - if a monster, can't move there, unles it is a
363 * hidden dm
364 */
365 if (OB_MOVE_BLOCK (ob, tmp))
366 return 1;
367 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
368 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
369 return 1;
370 }
371
372 }
373 return 0;
374} 374}
375 375
376 376
377/* 377/*
378 * Returns true if the given object can't fit in the given spot. 378 * Returns true if the given object can't fit in the given spot.
… …
399 * Note this used to be arch_blocked, but with new movement 399 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 400 * code, we need to have actual object to check its move_type
401 * against the move_block values. 401 * against the move_block values.
402 */ 402 */
403 403
404int
404int ob_blocked(const object *ob,mapstruct *m,sint16 x,sint16 y) { 405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{
405 archetype *tmp; 407 archetype *tmp;
406 int flag; 408 int flag;
407 mapstruct *m1; 409 maptile *m1;
408 sint16 sx, sy; 410 sint16 sx, sy;
409 411
410 if(ob==NULL) { 412 if (ob == NULL)
413 {
411 flag= get_map_flags(m,&m1, x,y, &sx, &sy); 414 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
412 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 415 if (flag & P_OUT_OF_MAP)
416 return P_OUT_OF_MAP;
413 417
414 /* don't have object, so don't know what types would block */ 418 /* don't have object, so don't know what types would block */
415 return(GET_MAP_MOVE_BLOCK(m1, sx, sy)); 419 return (GET_MAP_MOVE_BLOCK (m1, sx, sy));
416 } 420 }
417 421
418 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) { 422 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more)
423 {
419 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); 424 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
420 425
421 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 426 if (flag & P_OUT_OF_MAP)
422 if (flag & P_IS_ALIVE) return P_IS_ALIVE; 427 return P_OUT_OF_MAP;
428 if (flag & P_IS_ALIVE)
429 return P_IS_ALIVE;
423 430
424 /* find_first_free_spot() calls this function. However, often 431 /* find_first_free_spot() calls this function. However, often
425 * ob doesn't have any move type (when used to place exits) 432 * ob doesn't have any move type (when used to place exits)
426 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 433 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
427 */ 434 */
428 435
429 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue; 436 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL)
437 continue;
430 438
431 /* Note it is intentional that we check ob - the movement type of the 439 /* Note it is intentional that we check ob - the movement type of the
432 * head of the object should correspond for the entire object. 440 * head of the object should correspond for the entire object.
433 */ 441 */
434 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) 442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))
435 return AB_NO_PASS; 443 return AB_NO_PASS;
436 444
437 } 445 }
438 return 0; 446 return 0;
439} 447}
440 448
441/* When the map is loaded, load_object does not actually insert objects 449/* When the map is loaded, load_object does not actually insert objects
442 * into inventory, but just links them. What this does is go through 450 * into inventory, but just links them. What this does is go through
443 * and insert them properly. 451 * and insert them properly.
444 * The object 'container' is the object that contains the inventory. 452 * The object 'container' is the object that contains the inventory.
445 * This is needed so that we can update the containers weight. 453 * This is needed so that we can update the containers weight.
446 */ 454 */
447 455
456void
448void fix_container(object *container) 457fix_container (object *container)
449{ 458{
450 object *tmp=container->inv, *next; 459 object *tmp = container->inv, *next;
451 460
452 container->inv=NULL; 461 container->inv = NULL;
453 while (tmp!=NULL) { 462 while (tmp != NULL)
463 {
454 next = tmp->below; 464 next = tmp->below;
455 if (tmp->inv) 465 if (tmp->inv)
456 fix_container(tmp); 466 fix_container (tmp);
457 (void) insert_ob_in_ob(tmp,container); 467 (void) insert_ob_in_ob (tmp, container);
458 tmp = next; 468 tmp = next;
459 } 469 }
460 /* sum_weight will go through and calculate what all the containers are 470 /* sum_weight will go through and calculate what all the containers are
461 * carrying. 471 * carrying.
462 */ 472 */
463 sum_weight(container); 473 sum_weight (container);
464} 474}
465 475
466/* link_multipart_objects go through all the objects on the map looking 476/* link_multipart_objects go through all the objects on the map looking
467 * for objects whose arch says they are multipart yet according to the 477 * for objects whose arch says they are multipart yet according to the
468 * info we have, they only have the head (as would be expected when 478 * info we have, they only have the head (as would be expected when
469 * they are saved). We do have to look for the old maps that did save 479 * they are saved). We do have to look for the old maps that did save
470 * the more sections and not re-add sections for them. 480 * the more sections and not re-add sections for them.
471 */ 481 */
472 482
473static void link_multipart_objects(mapstruct *m) 483static void
484link_multipart_objects (maptile *m)
474{ 485{
475 int x,y; 486 int x, y;
476 object *tmp, *op, *last, *above; 487 object *tmp, *op, *last, *above;
477 archetype *at; 488 archetype *at;
478 489
479 for(x=0;x<MAP_WIDTH(m);x++) 490 for (x = 0; x < MAP_WIDTH (m); x++)
480 for(y=0;y<MAP_HEIGHT(m);y++) 491 for (y = 0; y < MAP_HEIGHT (m); y++)
481 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) { 492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
482 above=tmp->above; 493 {
494 above = tmp->above;
483 495
484 /* already multipart - don't do anything more */ 496 /* already multipart - don't do anything more */
485 if (tmp->head || tmp->more) continue; 497 if (tmp->head || tmp->more)
498 continue;
486 499
487 /* If there is nothing more to this object, this for loop 500 /* If there is nothing more to this object, this for loop
488 * won't do anything. 501 * won't do anything.
489 */ 502 */
490 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) { 503 for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op)
504 {
491 op = arch_to_object(at); 505 op = arch_to_object (at);
492 506
493 /* update x,y coordinates */ 507 /* update x,y coordinates */
494 op->x += tmp->x; 508 op->x += tmp->x;
495 op->y += tmp->y; 509 op->y += tmp->y;
496 op->head = tmp; 510 op->head = tmp;
497 op->map = m; 511 op->map = m;
498 last->more = op; 512 last->more = op;
499 if (tmp->name != op->name) { 513 op->name = tmp->name;
500 if (op->name) free_string(op->name); 514 op->title = tmp->title;
501 op->name = add_string(tmp->name);
502 }
503 if (tmp->title != op->title) {
504 if (op->title) free_string(op->title);
505 op->title = add_string(tmp->title);
506 }
507 /* we could link all the parts onto tmp, and then just 515 /* we could link all the parts onto tmp, and then just
508 * call insert_ob_in_map once, but the effect is the same, 516 * call insert_ob_in_map once, but the effect is the same,
509 * as insert_ob_in_map will call itself with each part, and 517 * as insert_ob_in_map will call itself with each part, and
510 * the coding is simpler to just to it here with each part. 518 * the coding is simpler to just to it here with each part.
511 */ 519 */
512 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON); 520 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
513 } /* for at = tmp->arch->more */ 521 } /* for at = tmp->arch->more */
514 } /* for objects on this space */ 522 } /* for objects on this space */
515} 523}
516
517
518 524
519/* 525/*
520 * Loads (ands parses) the objects into a given map from the specified 526 * Loads (ands parses) the objects into a given map from the specified
521 * file pointer. 527 * file pointer.
522 * mapflags is the same as we get with load_original_map 528 * mapflags is the same as we get with load_original_map
523 */ 529 */
524 530void
525void load_objects (mapstruct *m, FILE *fp, int mapflags) { 531load_objects (maptile *m, object_thawer & fp, int mapflags)
526 int i,j,bufstate=LO_NEWFILE; 532{
533 int i, j;
527 int unique; 534 int unique;
528 object *op, *prev=NULL,*last_more=NULL, *otmp; 535 object *op, *prev = NULL, *last_more = NULL, *otmp;
529 536
530 op=get_object(); 537 op = get_object ();
531 op->map = m; /* To handle buttons correctly */ 538 op->map = m; /* To handle buttons correctly */
532 539
533 while((i=load_object(fp,op,bufstate, mapflags))) { 540 while ((i = load_object (fp, op, mapflags)))
534 /* Since the loading of the map header does not load an object 541 {
535 * anymore, we need to pass LO_NEWFILE for the first object loaded,
536 * and then switch to LO_REPEAT for faster loading.
537 */
538 bufstate = LO_REPEAT;
539
540 /* if the archetype for the object is null, means that we 542 /* if the archetype for the object is null, means that we
541 * got an invalid object. Don't do anything with it - the game 543 * got an invalid object. Don't do anything with it - the game
542 * or editor will not be able to do anything with it either. 544 * or editor will not be able to do anything with it either.
543 */ 545 */
544 if (op->arch==NULL) { 546 if (op->arch == NULL)
547 {
545 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)"); 548 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
546 continue; 549 continue;
547 } 550 }
548 551
549 552
550 switch(i) { 553 switch (i)
554 {
551 case LL_NORMAL: 555 case LL_NORMAL:
552 /* if we are loading an overlay, put the floors on the bottom */ 556 /* if we are loading an overlay, put the floors on the bottom */
553 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) || 557 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
554 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
555 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
556 else 559 else
557 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 560 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
558 561
559 if (op->inv) 562 if (op->inv)
560 sum_weight(op); 563 sum_weight (op);
561 564
562 prev=op,last_more=op; 565 prev = op, last_more = op;
563 break; 566 break;
564 567
565 case LL_MORE: 568 case LL_MORE:
566 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 569 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
567 op->head=prev,last_more->more=op,last_more=op; 570 op->head = prev, last_more->more = op, last_more = op;
568 break; 571 break;
569 } 572 }
573
570 if (mapflags & MAP_STYLE) { 574 if (mapflags & MAP_STYLE)
571 remove_from_active_list(op); 575 remove_from_active_list (op);
572 } 576
573 op=get_object(); 577 op = get_object ();
574 op->map = m; 578 op->map = m;
575 } 579 }
580
576 for (i=0;i<m->width;i++){ 581 for (i = 0; i < m->width; i++)
582 {
577 for (j=0;j<m->height;j++){ 583 for (j = 0; j < m->height; j++)
584 {
578 unique =0; 585 unique = 0;
579 /* check for unique items, or unique squares */ 586 /* check for unique items, or unique squares */
580 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) { 587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above)
588 {
581 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL)) 589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
582 unique = 1; 590 unique = 1;
583 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique)) 591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
584 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL); 592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
593 }
594 }
585 } 595 }
586 } 596
587 } 597 op->destroy (0);
588 free_object(op);
589 link_multipart_objects(m); 598 link_multipart_objects (m);
590} 599}
591 600
592/* This saves all the objects on the map in a non destructive fashion. 601/* This saves all the objects on the map in a non destructive fashion.
593 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 602 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
594 * and we only save the head of multi part objects - this is needed 603 * and we only save the head of multi part objects - this is needed
595 * in order to do map tiling properly. 604 * in order to do map tiling properly.
596 */ 605 */
597void save_objects (mapstruct *m, FILE *fp, FILE *fp2, int flag) { 606void
607save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag)
608{
598 int i, j = 0,unique=0; 609 int i, j = 0, unique = 0;
599 object *op; 610 object *op;
611
600 /* first pass - save one-part objects */ 612 /* first pass - save one-part objects */
601 for(i = 0; i < MAP_WIDTH(m); i++) 613 for (i = 0; i < MAP_WIDTH (m); i++)
602 for (j = 0; j < MAP_HEIGHT(m); j++) { 614 for (j = 0; j < MAP_HEIGHT (m); j++)
615 {
603 unique=0; 616 unique = 0;
604 for(op = get_map_ob (m, i, j); op; op = op->above) { 617 for (op = get_map_ob (m, i, j); op; op = op->above)
618 {
605 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
606 unique=1; 620 unique = 1;
607 621
608 if(op->type == PLAYER) { 622 if (op->type == PLAYER)
623 {
609 LOG(llevDebug, "Player on map that is being saved\n"); 624 LOG (llevDebug, "Player on map that is being saved\n");
610 continue; 625 continue;
611 } 626 }
612 627
613 if (op->head || op->owner) 628 if (op->head || op->owner)
614 continue; 629 continue;
615 630
616 if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) 631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
617 save_object( fp2 , op, 3); 632 save_object (fp2, op, 3);
618 else 633 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
619 if (flag == 0 || 634 save_object (fp, op, 3);
620 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) &&
621 !QUERY_FLAG(op, FLAG_UNPAID))))
622 save_object(fp, op, 3);
623 635
624 } /* for this space */ 636 } /* for this space */
625 } /* for this j */ 637 } /* for this j */
638}
639
640maptile::maptile ()
641{
642 in_memory = MAP_SWAPPED;
643 /* The maps used to pick up default x and y values from the
644 * map archetype. Mimic that behaviour.
645 */
646 MAP_WIDTH (this) = 16;
647 MAP_HEIGHT (this) = 16;
648 MAP_RESET_TIMEOUT (this) = 0;
649 MAP_TIMEOUT (this) = 300;
650 MAP_ENTER_X (this) = 0;
651 MAP_ENTER_Y (this) = 0;
652 /*set part to -1 indicating conversion to weather map not yet done */
653 MAP_WORLDPARTX (this) = -1;
654 MAP_WORLDPARTY (this) = -1;
626} 655}
627 656
628/* 657/*
629 * Allocates, initialises, and returns a pointer to a mapstruct. 658 * Allocates, initialises, and returns a pointer to a maptile.
630 * Modified to no longer take a path option which was not being 659 * Modified to no longer take a path option which was not being
631 * used anyways. MSW 2001-07-01 660 * used anyways. MSW 2001-07-01
632 */ 661 */
662maptile *
663get_linked_map (void)
664{
665 maptile *mp, *map = new maptile;
633 666
634mapstruct *get_linked_map(void) {
635 mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct));
636 mapstruct *mp;
637
638 if(map==NULL)
639 fatal(OUT_OF_MEMORY);
640
641 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); 667 for (mp = first_map; mp && mp->next; mp = mp->next);
668
642 if(mp==NULL) 669 if (mp == NULL)
643 first_map=map; 670 first_map = map;
644 else 671 else
645 mp->next=map; 672 mp->next = map;
646 673
647 map->in_memory=MAP_SWAPPED;
648 /* The maps used to pick up default x and y values from the
649 * map archetype. Mimic that behaviour.
650 */
651 MAP_WIDTH(map)=16;
652 MAP_HEIGHT(map)=16;
653 MAP_RESET_TIMEOUT(map)=0;
654 MAP_TIMEOUT(map)=300;
655 MAP_ENTER_X(map)=0;
656 MAP_ENTER_Y(map)=0;
657 /*set part to -1 indicating conversion to weather map not yet done*/
658 MAP_WORLDPARTX(map)=-1;
659 MAP_WORLDPARTY(map)=-1;
660 return map; 674 return map;
661} 675}
662 676
663/* 677/*
664 * Allocates the arrays contained in a mapstruct. 678 * Allocates the arrays contained in a maptile.
665 * This basically allocates the dynamic array of spaces for the 679 * This basically allocates the dynamic array of spaces for the
666 * map. 680 * map.
667 */ 681 */
668 682void
669void allocate_map(mapstruct *m) { 683maptile::allocate ()
684{
670 m->in_memory = MAP_IN_MEMORY; 685 in_memory = MAP_IN_MEMORY;
686
671 /* Log this condition and free the storage. We could I suppose 687 /* Log this condition and free the storage. We could I suppose
672 * realloc, but if the caller is presuming the data will be intact, 688 * realloc, but if the caller is presuming the data will be intact,
673 * that is their poor assumption. 689 * that is their poor assumption.
674 */ 690 */
675 if (m->spaces) { 691 if (spaces)
692 {
676 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path); 693 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
677 free(m->spaces); 694 free (spaces);
678 } 695 }
679 696
680 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace)); 697 spaces = (MapSpace *)
698 calloc (1, width * height * sizeof (MapSpace));
681 699
682 if(m->spaces==NULL) 700 if (!spaces)
683 fatal(OUT_OF_MEMORY); 701 fatal (OUT_OF_MEMORY);
684} 702}
685 703
686/* Create and returns a map of the specific size. Used 704/* Create and returns a map of the specific size. Used
687 * in random map code and the editor. 705 * in random map code and the editor.
688 */ 706 */
707maptile *
689mapstruct *get_empty_map(int sizex, int sizey) { 708get_empty_map (int sizex, int sizey)
709{
690 mapstruct *m = get_linked_map(); 710 maptile *m = get_linked_map ();
711
691 m->width = sizex; 712 m->width = sizex;
692 m->height = sizey; 713 m->height = sizey;
693 m->in_memory = MAP_SWAPPED; 714 m->in_memory = MAP_SWAPPED;
694 allocate_map(m); 715 m->allocate ();
716
695 return m; 717 return m;
696} 718}
697 719
698/* Takes a string from a map definition and outputs a pointer to the array of shopitems 720/* Takes a string from a map definition and outputs a pointer to the array of shopitems
699 * corresponding to that string. Memory is allocated for this, it must be freed 721 * corresponding to that string. Memory is allocated for this, it must be freed
700 * at a later date. 722 * at a later date.
701 * Called by parse_map_headers below. 723 * Called by parse_map_headers below.
702 */ 724 */
703 725
726static shopitems *
704static shopitems *parse_shop_string (const char *input_string) { 727parse_shop_string (const char *input_string)
728{
705 char *shop_string, *p, *q, *next_semicolon, *next_colon; 729 char *shop_string, *p, *q, *next_semicolon, *next_colon;
706 shopitems *items=NULL; 730 shopitems *items = NULL;
707 int i=0, number_of_entries=0; 731 int i = 0, number_of_entries = 0;
708 const typedata *current_type; 732 const typedata *current_type;
709 733
710 shop_string=strdup_local(input_string); 734 shop_string = strdup_local (input_string);
711 p=shop_string; 735 p = shop_string;
712 /* first we'll count the entries, we'll need that for allocating the array shortly */ 736 /* first we'll count the entries, we'll need that for allocating the array shortly */
713 while (p) { 737 while (p)
738 {
714 p=strchr(p, ';'); 739 p = strchr (p, ';');
715 number_of_entries++; 740 number_of_entries++;
716 if (p) p++; 741 if (p)
742 p++;
717 } 743 }
718 p=shop_string; 744 p = shop_string;
719 strip_endline(p); 745 strip_endline (p);
720 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); 746 items = new shopitems[number_of_entries + 1];
721 memset(items, 0, (sizeof(shopitems) * number_of_entries+1));
722 for (i=0; i<number_of_entries; i++) { 747 for (i = 0; i < number_of_entries; i++)
723 if (!p) { 748 {
749 if (!p)
750 {
724 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 751 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
725 break; 752 break;
726 } 753 }
727 next_semicolon=strchr(p, ';'); 754 next_semicolon = strchr (p, ';');
728 next_colon=strchr(p, ':'); 755 next_colon = strchr (p, ':');
729 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 756 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
730 if (next_colon &&( !next_semicolon || next_colon<next_semicolon)) 757 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
731 items[i].strength=atoi(strchr(p,':')+1); 758 items[i].strength = atoi (strchr (p, ':') + 1);
732 759
733 if (isdigit(*p) || *p=='*') { 760 if (isdigit (*p) || *p == '*')
761 {
734 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */ 762 items[i].typenum = atoi (p); /* atoi returns 0 when we have an asterisk */
735 current_type=get_typedata(items[i].typenum); 763 current_type = get_typedata (items[i].typenum);
736 if (current_type) { 764 if (current_type)
765 {
737 items[i].name=current_type->name; 766 items[i].name = current_type->name;
738 items[i].name_pl=current_type->name_pl; 767 items[i].name_pl = current_type->name_pl;
739 } 768 }
740 } 769 }
770 else
741 else { /*we have a named type, let's figure out what it is */ 771 { /*we have a named type, let's figure out what it is */
742 q=strpbrk(p,";:"); 772 q = strpbrk (p, ";:");
743 if (q) *q='\0'; 773 if (q)
744 774 *q = '\0';
775
745 current_type=get_typedata_by_name(p); 776 current_type = get_typedata_by_name (p);
746 if (current_type) { 777 if (current_type)
778 {
747 items[i].name=current_type->name; 779 items[i].name = current_type->name;
748 items[i].typenum=current_type->number; 780 items[i].typenum = current_type->number;
749 items[i].name_pl=current_type->name_pl; 781 items[i].name_pl = current_type->name_pl;
782 }
783 else
784 { /* oh uh, something's wrong, let's free up this one, and try
785 * the next entry while we're at it, better print a warning
786 */
787 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
788 }
789 }
790 items[i].index = number_of_entries;
791 if (next_semicolon)
792 p = ++next_semicolon;
793 else
794 p = NULL;
750 } 795 }
751 else { /* oh uh, something's wrong, let's free up this one, and try
752 * the next entry while we're at it, better print a warning
753 */
754 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
755 p, input_string);
756 }
757 }
758 items[i].index=number_of_entries;
759 if (next_semicolon) p=++next_semicolon;
760 else p=NULL;
761 }
762 free(shop_string); 796 free (shop_string);
763 return items; 797 return items;
764} 798}
765 799
766/* opposite of parse string, this puts the string that was originally fed in to 800/* opposite of parse string, this puts the string that was originally fed in to
767 * the map (or something equivilent) into output_string. */ 801 * the map (or something equivilent) into output_string. */
802static void
768static void print_shop_string(mapstruct *m, char *output_string) { 803print_shop_string (maptile *m, char *output_string)
804{
769 int i; 805 int i;
770 char tmp[MAX_BUF]; 806 char tmp[MAX_BUF];
807
771 strcpy(output_string, ""); 808 strcpy (output_string, "");
772 for (i=0; i< m->shopitems[0].index; i++) { 809 for (i = 0; i < m->shopitems[0].index; i++)
810 {
773 if (m->shopitems[i].typenum) { 811 if (m->shopitems[i].typenum)
812 {
774 if (m->shopitems[i].strength) { 813 if (m->shopitems[i].strength)
814 {
775 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 815 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
776 } 816 }
817 else
777 else sprintf(tmp, "%s;", m->shopitems[i].name); 818 sprintf (tmp, "%s;", m->shopitems[i].name);
778 } 819 }
779 else { 820 else
821 {
780 if (m->shopitems[i].strength) { 822 if (m->shopitems[i].strength)
823 {
781 sprintf(tmp, "*:%d;", m->shopitems[i].strength); 824 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
782 } 825 }
783 else sprintf(tmp, "*"); 826 else
784 } 827 sprintf (tmp, "*");
828 }
785 strcat(output_string, tmp); 829 strcat (output_string, tmp);
786 } 830 }
787} 831}
788 832
789/* This loads the header information of the map. The header 833/* This loads the header information of the map. The header
790 * contains things like difficulty, size, timeout, etc. 834 * contains things like difficulty, size, timeout, etc.
… …
797 * currently, there are few enough fields this is not a big deal. 841 * currently, there are few enough fields this is not a big deal.
798 * MSW 2001-07-01 842 * MSW 2001-07-01
799 * return 0 on success, 1 on failure. 843 * return 0 on success, 1 on failure.
800 */ 844 */
801 845
802static int load_map_header(FILE *fp, mapstruct *m) 846static int
847load_map_header (object_thawer & fp, maptile *m)
803{ 848{
804 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 849 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
805 int msgpos=0; 850 int msgpos = 0;
806 int maplorepos=0; 851 int maplorepos = 0;
807 852
808 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 853 while (fgets (buf, HUGE_BUF, fp) != NULL)
854 {
809 buf[HUGE_BUF-1] = 0; 855 buf[HUGE_BUF - 1] = 0;
810 key = buf; 856 key = buf;
811 while (isspace(*key)) key++; 857
812 if (*key == 0) continue; /* empty line */ 858 while (isspace (*key))
859 key++;
860
861 if (*key == 0)
862 continue; /* empty line */
863
813 value = strchr(key, ' '); 864 value = strchr (key, ' ');
814 if (!value) { 865
815 end = strchr(key, '\n'); 866 if (!value)
816 if (end != NULL) { 867 {
817 *end = 0; 868 if ((end = strchr (key, '\n')))
818 } 869 *end = 0;
819 } else { 870 }
871 else
872 {
820 *value = 0; 873 *value = 0;
821 value++; 874 value++;
822 end = strchr(value, '\n'); 875 end = strchr (value, '\n');
876
823 while (isspace(*value)) { 877 while (isspace (*value))
824 value++; 878 {
879 value++;
880
825 if (*value == '\0' || value == end) { 881 if (*value == '\0' || value == end)
882 {
826 /* Nothing but spaces. */ 883 /* Nothing but spaces. */
827 value = NULL; 884 value = NULL;
828 break; 885 break;
829 } 886 }
830 } 887 }
831 } 888 }
832 if (!end) { 889
890 if (!end)
891 {
833 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", 892 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
834 buf);
835 return 1; 893 return 1;
836 } 894 }
837
838 895
839 /* key is the field name, value is what it should be set 896 /* key is the field name, value is what it should be set
840 * to. We've already done the work to null terminate key, 897 * to. We've already done the work to null terminate key,
841 * and strip off any leading spaces for both of these. 898 * and strip off any leading spaces for both of these.
842 * We have not touched the newline at the end of the line - 899 * We have not touched the newline at the end of the line -
843 * these are needed for some values. the end pointer 900 * these are needed for some values. the end pointer
844 * points to the first of the newlines. 901 * points to the first of the newlines.
845 * value could be NULL! It would be easy enough to just point 902 * value could be NULL! It would be easy enough to just point
846 * this to "" to prevent cores, but that would let more errors slide 903 * this to "" to prevent cores, but that would let more errors slide
847 * through. 904 * through.
848 * 905 *
849 * First check for entries that do not use the value parameter, then 906 * First check for entries that do not use the value parameter, then
850 * validate that value is given and check for the remaining entries 907 * validate that value is given and check for the remaining entries
851 * that use the parameter. 908 * that use the parameter.
852 */ 909 */
853 910
854 if (!strcmp(key,"msg")) { 911 if (!strcmp (key, "msg"))
912 {
855 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 913 while (fgets (buf, HUGE_BUF, fp) != NULL)
856 if (!strcmp(buf,"endmsg\n")) break; 914 {
857 else { 915 if (!strcmp (buf, "endmsg\n"))
916 break;
917 else
918 {
858 /* slightly more efficient than strcat */ 919 /* slightly more efficient than strcat */
859 strcpy(msgbuf+msgpos, buf); 920 strcpy (msgbuf + msgpos, buf);
860 msgpos += strlen(buf); 921 msgpos += strlen (buf);
861 } 922 }
862 } 923 }
863 /* There are lots of maps that have empty messages (eg, msg/endmsg 924 /* There are lots of maps that have empty messages (eg, msg/endmsg
864 * with nothing between). There is no reason in those cases to 925 * with nothing between). There is no reason in those cases to
865 * keep the empty message. Also, msgbuf contains garbage data 926 * keep the empty message. Also, msgbuf contains garbage data
866 * when msgpos is zero, so copying it results in crashes 927 * when msgpos is zero, so copying it results in crashes
867 */ 928 */
868 if (msgpos != 0) 929 if (msgpos != 0)
869 m->msg = strdup_local(msgbuf); 930 m->msg = strdup_local (msgbuf);
870 } 931 }
871 else if (!strcmp(key,"maplore")) { 932 else if (!strcmp (key, "maplore"))
933 {
872 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 934 while (fgets (buf, HUGE_BUF, fp) != NULL)
873 if (!strcmp(buf,"endmaplore\n")) break; 935 {
874 else { 936 if (!strcmp (buf, "endmaplore\n"))
937 break;
938 else
939 {
875 /* slightly more efficient than strcat */ 940 /* slightly more efficient than strcat */
876 strcpy(maplorebuf+maplorepos, buf); 941 strcpy (maplorebuf + maplorepos, buf);
877 maplorepos += strlen(buf); 942 maplorepos += strlen (buf);
878 } 943 }
879 } 944 }
880 if (maplorepos != 0) 945 if (maplorepos != 0)
881 m->maplore = strdup_local(maplorebuf); 946 m->maplore = strdup_local (maplorebuf);
882 } 947 }
883 else if (!strcmp(key,"end")) { 948 else if (!strcmp (key, "end"))
884 break; 949 {
885 } 950 break;
951 }
886 else if (value == NULL) { 952 else if (value == NULL)
953 {
887 LOG(llevError, "Got '%s' line without parameter in map header\n", key); 954 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
888 } 955 }
889 else if (!strcmp(key, "arch")) { 956 else if (!strcmp (key, "arch"))
957 {
890 /* This is an oddity, but not something we care about much. */ 958 /* This is an oddity, but not something we care about much. */
891 if (strcmp(value,"map\n")) 959 if (strcmp (value, "map\n"))
892 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value); 960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
893 } 961 }
894 else if (!strcmp(key,"name")) { 962 else if (!strcmp (key, "name"))
895 *end=0; 963 {
964 *end = 0;
896 m->name = strdup_local(value); 965 m->name = strdup_local (value);
897 } 966 }
898 /* first strcmp value on these are old names supported 967 /* first strcmp value on these are old names supported
899 * for compatibility reasons. The new values (second) are 968 * for compatibility reasons. The new values (second) are
900 * what really should be used. 969 * what really should be used.
901 */ 970 */
971 else if (!strcmp (key, "oid"))
972 {
973 fp.get (m, atoi (value));
974 }
975 else if (!strcmp (key, "attach"))
976 {
977 m->attach = value;
978 }
902 else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 979 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980 {
903 m->enter_x = atoi(value); 981 m->enter_x = atoi (value);
982 }
904 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 983 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984 {
905 m->enter_y = atoi(value); 985 m->enter_y = atoi (value);
986 }
906 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 987 else if (!strcmp (key, "x") || !strcmp (key, "width"))
988 {
907 m->width = atoi(value); 989 m->width = atoi (value);
990 }
908 } else if (!strcmp(key,"y") || !strcmp(key, "height")) { 991 else if (!strcmp (key, "y") || !strcmp (key, "height"))
992 {
909 m->height = atoi(value); 993 m->height = atoi (value);
994 }
910 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) { 995 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996 {
911 m->reset_timeout = atoi(value); 997 m->reset_timeout = atoi (value);
998 }
912 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) { 999 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000 {
913 m->timeout = atoi(value); 1001 m->timeout = atoi (value);
1002 }
914 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) { 1003 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004 {
915 m->difficulty = atoi(value); 1005 m->difficulty = atoi (value);
1006 }
916 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) { 1007 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008 {
917 m->darkness = atoi(value); 1009 m->darkness = atoi (value);
1010 }
918 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) { 1011 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012 {
919 m->fixed_resettime = atoi(value); 1013 m->fixed_resettime = atoi (value);
1014 }
920 } else if (!strcmp(key,"unique")) { 1015 else if (!strcmp (key, "unique"))
1016 {
921 m->unique = atoi(value); 1017 m->unique = atoi (value);
1018 }
922 } else if (!strcmp(key,"template")) { 1019 else if (!strcmp (key, "template"))
1020 {
923 m->templatemap = atoi(value); 1021 m->templatemap = atoi (value);
1022 }
924 } else if (!strcmp(key,"region")) { 1023 else if (!strcmp (key, "region"))
1024 {
925 m->region = get_region_by_name(value); 1025 m->region = get_region_by_name (value);
1026 }
926 } else if (!strcmp(key,"shopitems")) { 1027 else if (!strcmp (key, "shopitems"))
927 *end=0; 1028 {
1029 *end = 0;
928 m->shopitems = parse_shop_string(value); 1030 m->shopitems = parse_shop_string (value);
1031 }
929 } else if (!strcmp(key,"shopgreed")) { 1032 else if (!strcmp (key, "shopgreed"))
1033 {
930 m->shopgreed = atof(value); 1034 m->shopgreed = atof (value);
1035 }
931 } else if (!strcmp(key,"shopmin")) { 1036 else if (!strcmp (key, "shopmin"))
1037 {
932 m->shopmin = atol(value); 1038 m->shopmin = atol (value);
1039 }
933 } else if (!strcmp(key,"shopmax")) { 1040 else if (!strcmp (key, "shopmax"))
1041 {
934 m->shopmax = atol(value); 1042 m->shopmax = atol (value);
1043 }
935 } else if (!strcmp(key,"shoprace")) { 1044 else if (!strcmp (key, "shoprace"))
936 *end=0; 1045 {
1046 *end = 0;
937 m->shoprace = strdup_local(value); 1047 m->shoprace = strdup_local (value);
1048 }
938 } else if (!strcmp(key,"outdoor")) { 1049 else if (!strcmp (key, "outdoor"))
1050 {
939 m->outdoor = atoi(value); 1051 m->outdoor = atoi (value);
1052 }
940 } else if (!strcmp(key, "temp")) { 1053 else if (!strcmp (key, "temp"))
1054 {
941 m->temp = atoi(value); 1055 m->temp = atoi (value);
1056 }
942 } else if (!strcmp(key, "pressure")) { 1057 else if (!strcmp (key, "pressure"))
1058 {
943 m->pressure = atoi(value); 1059 m->pressure = atoi (value);
1060 }
944 } else if (!strcmp(key, "humid")) { 1061 else if (!strcmp (key, "humid"))
1062 {
945 m->humid = atoi(value); 1063 m->humid = atoi (value);
1064 }
946 } else if (!strcmp(key, "windspeed")) { 1065 else if (!strcmp (key, "windspeed"))
1066 {
947 m->windspeed = atoi(value); 1067 m->windspeed = atoi (value);
1068 }
948 } else if (!strcmp(key, "winddir")) { 1069 else if (!strcmp (key, "winddir"))
1070 {
949 m->winddir = atoi(value); 1071 m->winddir = atoi (value);
1072 }
950 } else if (!strcmp(key, "sky")) { 1073 else if (!strcmp (key, "sky"))
1074 {
951 m->sky = atoi(value); 1075 m->sky = atoi (value);
1076 }
952 } else if (!strcmp(key, "nosmooth")) { 1077 else if (!strcmp (key, "nosmooth"))
1078 {
953 m->nosmooth = atoi(value); 1079 m->nosmooth = atoi (value);
954 } else if (!strcmp(key, "safe_map")) { 1080 }
955 m->safe_map = atoi(value);
956 }
957 else if (!strncmp(key,"tile_path_", 10)) { 1081 else if (!strncmp (key, "tile_path_", 10))
1082 {
958 int tile=atoi(key+10); 1083 int tile = atoi (key + 10);
959 1084
960 if (tile<1 || tile>4) { 1085 if (tile < 1 || tile > 4)
1086 {
961 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n", 1087 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
962 tile, m->path); 1088 }
963 } else { 1089 else
1090 {
964 char *path; 1091 char *path;
965 1092
966 *end = 0; 1093 *end = 0;
967 1094
968 if (m->tile_path[tile-1]) { 1095 if (m->tile_path[tile - 1])
1096 {
969 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n", 1097 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
970 tile, m->path);
971 free(m->tile_path[tile-1]); 1098 free (m->tile_path[tile - 1]);
972 m->tile_path[tile-1] = NULL; 1099 m->tile_path[tile - 1] = NULL;
973 } 1100 }
974 1101
975 if (check_path(value, 1) != -1) { 1102 if (check_path (value, 1) != -1)
1103 {
976 /* The unadorned path works. */ 1104 /* The unadorned path works. */
977 path = value; 1105 path = value;
978 } else { 1106 }
1107 else
1108 {
979 /* Try again; it could be a relative exit. */ 1109 /* Try again; it could be a relative exit. */
980 1110
981 path = path_combine_and_normalize(m->path, value); 1111 path = path_combine_and_normalize (m->path, value);
982 1112
983 if (check_path(path, 1) == -1) { 1113 if (check_path (path, 1) == -1)
1114 {
984 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); 1115 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
985 path = NULL; 1116 path = NULL;
986 } 1117 }
987 } 1118 }
988 1119
989 if (editor) { 1120 if (editor)
1121 {
990 /* Use the value as in the file. */ 1122 /* Use the value as in the file. */
991 m->tile_path[tile-1] = strdup_local(value); 1123 m->tile_path[tile - 1] = strdup_local (value);
992 } else if (path != NULL) { 1124 }
1125 else if (path != NULL)
1126 {
993 /* Use the normalized value. */ 1127 /* Use the normalized value. */
994 m->tile_path[tile-1] = strdup_local(path); 1128 m->tile_path[tile - 1] = strdup_local (path);
995 } 1129 }
996 } /* end if tile direction (in)valid */ 1130 } /* end if tile direction (in)valid */
997 } 1131 }
998 else { 1132 else
1133 {
999 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value); 1134 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1000 } 1135 }
1001 } 1136 }
1002 if (!key || strcmp(key,"end")) { 1137 if (!key || strcmp (key, "end"))
1138 {
1003 LOG(llevError,"Got premature eof on map header!\n"); 1139 LOG (llevError, "Got premature eof on map header!\n");
1004 return 1; 1140 return 1;
1005 } 1141 }
1006 return 0; 1142 return 0;
1007} 1143}
1008 1144
1009/* 1145/*
1010 * Opens the file "filename" and reads information about the map 1146 * Opens the file "filename" and reads information about the map
1011 * from the given file, and stores it in a newly allocated 1147 * from the given file, and stores it in a newly allocated
1012 * mapstruct. A pointer to this structure is returned, or NULL on failure. 1148 * maptile. A pointer to this structure is returned, or NULL on failure.
1013 * flags correspond to those in map.h. Main ones used are 1149 * flags correspond to those in map.h. Main ones used are
1014 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and 1150 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1015 * MAP_BLOCK, in which case we block on this load. This happens in all 1151 * MAP_BLOCK, in which case we block on this load. This happens in all
1016 * cases, no matter if this flag is set or not. 1152 * cases, no matter if this flag is set or not.
1017 * MAP_STYLE: style map - don't add active objects, don't add to server 1153 * MAP_STYLE: style map - don't add active objects, don't add to server
1018 * managed map list. 1154 * managed map list.
1019 */ 1155 */
1020 1156
1157maptile *
1021mapstruct *load_original_map(const char *filename, int flags) { 1158load_original_map (const char *filename, int flags)
1022 FILE *fp; 1159{
1023 mapstruct *m; 1160 maptile *m;
1024 int comp;
1025 char pathname[MAX_BUF]; 1161 char pathname[MAX_BUF];
1026 1162
1027 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1028 if (flags & MAP_PLAYER_UNIQUE) 1163 if (flags & MAP_PLAYER_UNIQUE)
1029 strcpy(pathname, filename); 1164 strcpy (pathname, filename);
1030 else if (flags & MAP_OVERLAY) 1165 else if (flags & MAP_OVERLAY)
1031 strcpy(pathname, create_overlay_pathname(filename)); 1166 strcpy (pathname, create_overlay_pathname (filename));
1032 else 1167 else
1033 strcpy(pathname, create_pathname(filename)); 1168 strcpy (pathname, create_pathname (filename));
1034 1169
1035 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1170 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1036 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
1037 return (NULL);
1038 }
1039 1171
1172 object_thawer thawer (pathname);
1173
1174 if (!thawer)
1175 return 0;
1176
1040 m = get_linked_map(); 1177 m = get_linked_map ();
1041 1178
1042 strcpy (m->path, filename); 1179 strcpy (m->path, filename);
1043 if (load_map_header(fp, m)) { 1180 if (load_map_header (thawer, m))
1181 {
1044 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1182 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1045 filename, flags);
1046 delete_map(m); 1183 delete_map (m);
1047 return NULL; 1184 return NULL;
1048 } 1185 }
1049 1186
1050 allocate_map(m); 1187 m->allocate ();
1051 m->compressed = comp;
1052 1188
1053 m->in_memory=MAP_LOADING; 1189 m->in_memory = MAP_LOADING;
1054 load_objects (m, fp, flags & (MAP_BLOCK|MAP_STYLE)); 1190 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1055 close_and_delete(fp, comp); 1191
1056 m->in_memory=MAP_IN_MEMORY; 1192 m->in_memory = MAP_IN_MEMORY;
1057 if (!MAP_DIFFICULTY(m)) 1193 if (!MAP_DIFFICULTY (m))
1058 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1194 MAP_DIFFICULTY (m) = calculate_difficulty (m);
1059 set_map_reset_time(m); 1195 set_map_reset_time (m);
1060 if (load_original_map_callback) 1196 m->instantiate ();
1061 load_original_map_callback(m);
1062 return (m); 1197 return (m);
1063} 1198}
1064 1199
1065/* 1200/*
1066 * Loads a map, which has been loaded earlier, from file. 1201 * Loads a map, which has been loaded earlier, from file.
1067 * Return the map object we load into (this can change from the passed 1202 * Return the map object we load into (this can change from the passed
1068 * option if we can't find the original map) 1203 * option if we can't find the original map)
1069 */ 1204 */
1070 1205
1071static mapstruct *load_temporary_map(mapstruct *m) { 1206static maptile *
1072 FILE *fp; 1207load_temporary_map (maptile *m)
1073 int comp; 1208{
1074 char buf[MAX_BUF]; 1209 char buf[MAX_BUF];
1075 1210
1076 if (!m->tmpname) { 1211 if (!m->tmpname)
1212 {
1077 LOG(llevError, "No temporary filename for map %s\n", m->path); 1213 LOG (llevError, "No temporary filename for map %s\n", m->path);
1078 strcpy(buf, m->path); 1214 strcpy (buf, m->path);
1079 delete_map(m); 1215 delete_map (m);
1080 m = load_original_map(buf, 0); 1216 m = load_original_map (buf, 0);
1081 if(m==NULL) return NULL; 1217 if (m == NULL)
1218 return NULL;
1082 fix_auto_apply(m); /* Chests which open as default */ 1219 fix_auto_apply (m); /* Chests which open as default */
1083 return m; 1220 return m;
1221 }
1222
1223 object_thawer thawer (m->tmpname);
1224
1225 if (!thawer)
1084 } 1226 {
1085
1086 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) {
1087 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno));
1088 strcpy(buf, m->path); 1227 strcpy (buf, m->path);
1089 delete_map(m); 1228 delete_map (m);
1090 m = load_original_map(buf, 0); 1229 m = load_original_map (buf, 0);
1091 if(m==NULL) return NULL; 1230 if (!m)
1231 return NULL;
1092 fix_auto_apply(m); /* Chests which open as default */ 1232 fix_auto_apply (m); /* Chests which open as default */
1093 return m; 1233 return m;
1094 }
1095 1234 }
1096 1235
1097 if (load_map_header(fp, m)) { 1236 if (load_map_header (thawer, m))
1237 {
1098 LOG(llevError,"Error loading map header for %s (%s)\n", 1238 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1099 m->path, m->tmpname);
1100 delete_map(m); 1239 delete_map (m);
1101 m = load_original_map(m->path, 0); 1240 m = load_original_map (m->path, 0);
1102 return NULL; 1241 return NULL;
1103 } 1242 }
1104 m->compressed = comp;
1105 allocate_map(m);
1106 1243
1244 m->allocate ();
1245
1107 m->in_memory=MAP_LOADING; 1246 m->in_memory = MAP_LOADING;
1108 load_objects (m, fp, 0); 1247 load_objects (m, thawer, 0);
1109 close_and_delete(fp, comp); 1248
1110 m->in_memory=MAP_IN_MEMORY; 1249 m->in_memory = MAP_IN_MEMORY;
1111 if (load_temporary_map_callback) 1250 INVOKE_MAP (SWAPIN, m);
1112 load_temporary_map_callback(m);
1113 return m; 1251 return m;
1114} 1252}
1115 1253
1116/* 1254/*
1117 * Loads a map, which has been loaded earlier, from file. 1255 * Loads a map, which has been loaded earlier, from file.
1118 * Return the map object we load into (this can change from the passed 1256 * Return the map object we load into (this can change from the passed
1119 * option if we can't find the original map) 1257 * option if we can't find the original map)
1120 */ 1258 */
1121 1259
1260maptile *
1122mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1261load_overlay_map (const char *filename, maptile *m)
1123 FILE *fp; 1262{
1124 int comp;
1125 char pathname[MAX_BUF]; 1263 char pathname[MAX_BUF];
1126 1264
1127 strcpy(pathname, create_overlay_pathname(filename)); 1265 strcpy (pathname, create_overlay_pathname (filename));
1128 1266
1129 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1267 object_thawer thawer (pathname);
1130/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
1131 return m;
1132 }
1133
1134 if (load_map_header(fp, m)) {
1135 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1136 m->path, pathname);
1137 delete_map(m);
1138 m = load_original_map(m->path, 0);
1139 return NULL;
1140 }
1141 m->compressed = comp;
1142 /*allocate_map(m);*/
1143 1268
1144 m->in_memory=MAP_LOADING; 1269 if (!thawer)
1145 load_objects (m, fp, MAP_OVERLAY);
1146 close_and_delete(fp, comp);
1147 m->in_memory=MAP_IN_MEMORY;
1148 return m; 1270 return m;
1271
1272 if (load_map_header (thawer, m))
1273 {
1274 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1275 delete_map (m);
1276 m = load_original_map (m->path, 0);
1277 return NULL;
1278 }
1279 /*m->allocate ();*/
1280
1281 m->in_memory = MAP_LOADING;
1282 load_objects (m, thawer, MAP_OVERLAY);
1283
1284 m->in_memory = MAP_IN_MEMORY;
1285 return m;
1149} 1286}
1150 1287
1151/****************************************************************************** 1288/******************************************************************************
1152 * This is the start of unique map handling code 1289 * This is the start of unique map handling code
1153 *****************************************************************************/ 1290 *****************************************************************************/
1154 1291
1155/* This goes through map 'm' and removed any unique items on the map. */ 1292/* This goes through map 'm' and removed any unique items on the map. */
1156static void delete_unique_items(mapstruct *m) 1293static void
1294delete_unique_items (maptile *m)
1157{ 1295{
1158 int i,j,unique; 1296 int i, j, unique;
1159 object *op, *next; 1297 object *op, *next;
1160 1298
1161 for(i=0; i<MAP_WIDTH(m); i++) 1299 for (i = 0; i < MAP_WIDTH (m); i++)
1162 for(j=0; j<MAP_HEIGHT(m); j++) { 1300 for (j = 0; j < MAP_HEIGHT (m); j++)
1301 {
1163 unique=0; 1302 unique = 0;
1164 for (op=get_map_ob(m, i, j); op; op=next) { 1303 for (op = get_map_ob (m, i, j); op; op = next)
1165 next = op->above; 1304 {
1305 next = op->above;
1166 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 1306 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1167 unique=1; 1307 unique = 1;
1168 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 1308 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1169 clean_object(op); 1309 {
1310 clean_object (op);
1170 if (QUERY_FLAG(op, FLAG_IS_LINKED)) 1311 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1171 remove_button_link(op); 1312 remove_button_link (op);
1172 remove_ob(op); 1313 op->remove ();
1173 free_object(op); 1314 op->destroy (0);
1174 } 1315 }
1316 }
1175 } 1317 }
1176 }
1177} 1318}
1178 1319
1179 1320
1180/* 1321/*
1181 * Loads unique objects from file(s) into the map which is in memory 1322 * Loads unique objects from file(s) into the map which is in memory
1182 * m is the map to load unique items into. 1323 * m is the map to load unique items into.
1183 */ 1324 */
1184static void load_unique_objects(mapstruct *m) { 1325static void
1185 FILE *fp; 1326load_unique_objects (maptile *m)
1327{
1186 int comp,count; 1328 int count;
1187 char firstname[MAX_BUF]; 1329 char firstname[MAX_BUF];
1188 1330
1189 for (count=0; count<10; count++) { 1331 for (count = 0; count < 10; count++)
1332 {
1190 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1333 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1191 if (!access(firstname, R_OK)) break; 1334 if (!access (firstname, R_OK))
1335 break;
1192 } 1336 }
1193 /* If we get here, we did not find any map */ 1337 /* If we get here, we did not find any map */
1194 if (count==10) return; 1338 if (count == 10)
1339 return;
1195 1340
1196 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) { 1341 object_thawer thawer (firstname);
1197 /* There is no expectation that every map will have unique items, but this
1198 * is debug output, so leave it in.
1199 */
1200 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1201 return;
1202 }
1203 1342
1343 if (!thawer)
1344 return;
1345
1204 m->in_memory=MAP_LOADING; 1346 m->in_memory = MAP_LOADING;
1205 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1347 if (m->tmpname == NULL) /* if we have loaded unique items from */
1206 delete_unique_items(m); /* original map before, don't duplicate them */ 1348 delete_unique_items (m); /* original map before, don't duplicate them */
1207 load_object(fp, NULL, LO_NOREAD,0);
1208 load_objects (m, fp, 0); 1349 load_objects (m, thawer, 0);
1209 close_and_delete(fp, comp); 1350
1210 m->in_memory=MAP_IN_MEMORY; 1351 m->in_memory = MAP_IN_MEMORY;
1211} 1352}
1212 1353
1213 1354
1214/* 1355/*
1215 * Saves a map to file. If flag is set, it is saved into the same 1356 * Saves a map to file. If flag is set, it is saved into the same
1216 * file it was (originally) loaded from. Otherwise a temporary 1357 * file it was (originally) loaded from. Otherwise a temporary
1217 * filename will be genarated, and the file will be stored there. 1358 * filename will be genarated, and the file will be stored there.
1218 * The temporary filename will be stored in the mapstructure. 1359 * The temporary filename will be stored in the maptileure.
1219 * If the map is unique, we also save to the filename in the map 1360 * If the map is unique, we also save to the filename in the map
1220 * (this should have been updated when first loaded) 1361 * (this should have been updated when first loaded)
1221 */ 1362 */
1222 1363
1364int
1223int new_save_map(mapstruct *m, int flag) { 1365new_save_map (maptile *m, int flag)
1224 FILE *fp, *fp2; 1366{
1225 char filename[MAX_BUF],buf[MAX_BUF], shop[MAX_BUF]; 1367 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1226 int i; 1368 int i;
1227 1369
1228 if (flag && !*m->path) { 1370 if (flag && !*m->path)
1371 {
1229 LOG(llevError,"Tried to save map without path.\n"); 1372 LOG (llevError, "Tried to save map without path.\n");
1230 return -1; 1373 return -1;
1231 }
1232 1374 }
1375
1233 if (flag || (m->unique) || (m->templatemap)) { 1376 if (flag || (m->unique) || (m->templatemap))
1234 if (!m->unique && !m->templatemap) { /* flag is set */ 1377 {
1378 if (!m->unique && !m->templatemap)
1379 { /* flag is set */
1235 if (flag == 2) 1380 if (flag == 2)
1236 strcpy(filename, create_overlay_pathname(m->path)); 1381 strcpy (filename, create_overlay_pathname (m->path));
1237 else 1382 else
1238 strcpy (filename, create_pathname (m->path)); 1383 strcpy (filename, create_pathname (m->path));
1239 } else 1384 }
1385 else
1240 strcpy (filename, m->path); 1386 strcpy (filename, m->path);
1241 1387
1242 /* If the compression suffix already exists on the filename, don't
1243 * put it on again. This nasty looking strcmp checks to see if the
1244 * compression suffix is at the end of the filename already.
1245 */
1246 if (m->compressed &&
1247 strcmp((filename + strlen(filename)-strlen(uncomp[m->compressed][0])),
1248 uncomp[m->compressed][0]))
1249 strcat(filename, uncomp[m->compressed][0]);
1250 make_path_to_file(filename); 1388 make_path_to_file (filename);
1251 } else { 1389 }
1390 else
1391 {
1252 if (!m->tmpname) 1392 if (!m->tmpname)
1253 m->tmpname = tempnam_local(settings.tmpdir,NULL); 1393 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1394
1254 strcpy(filename, m->tmpname); 1395 strcpy (filename, m->tmpname);
1255 } 1396 }
1397
1256 LOG(llevDebug,"Saving map %s\n",m->path); 1398 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1257 m->in_memory = MAP_SAVING; 1399 m->in_memory = MAP_SAVING;
1258 1400
1259 unlink (filename); // do not overwrite backups if done via hardlinks 1401 object_freezer freezer;
1260 1402
1261 /* Compress if it isn't a temporary save. Do compress if unique */
1262 if (m->compressed && (m->unique || m->templatemap || flag)) {
1263 char buf[MAX_BUF];
1264 strcpy(buf, uncomp[m->compressed][2]);
1265 strcat(buf, " > ");
1266 strcat(buf, filename);
1267 fp = popen(buf, "w");
1268 } else
1269 fp = fopen(filename, "w");
1270
1271 if(fp == NULL) {
1272 LOG(llevError, "Cannot write %s: %s\n", filename, strerror_local(errno));
1273 return -1;
1274 }
1275
1276 /* legacy */ 1403 /* legacy */
1277 fprintf(fp,"arch map\n"); 1404 fprintf (freezer, "arch map\n");
1405 if (m->name)
1278 if (m->name) fprintf(fp,"name %s\n", m->name); 1406 fprintf (freezer, "name %s\n", m->name);
1407 if (!flag)
1279 if (!flag) fprintf(fp,"swap_time %d\n", m->swap_time); 1408 fprintf (freezer, "swap_time %d\n", m->swap_time);
1409 if (m->reset_timeout)
1280 if (m->reset_timeout) fprintf(fp,"reset_timeout %d\n", m->reset_timeout); 1410 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1411 if (m->fixed_resettime)
1281 if (m->fixed_resettime) fprintf(fp,"fixed_resettime %d\n", m->fixed_resettime); 1412 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1282 /* we unfortunately have no idea if this is a value the creator set 1413 /* we unfortunately have no idea if this is a value the creator set
1283 * or a difficulty value we generated when the map was first loaded 1414 * or a difficulty value we generated when the map was first loaded
1284 */ 1415 */
1416 if (m->difficulty)
1285 if (m->difficulty) fprintf(fp,"difficulty %d\n", m->difficulty); 1417 fprintf (freezer, "difficulty %d\n", m->difficulty);
1418 if (m->region)
1286 if (m->region) fprintf(fp,"region %s\n", m->region->name); 1419 fprintf (freezer, "region %s\n", m->region->name);
1287 if (m->shopitems) { 1420 if (m->shopitems)
1421 {
1288 print_shop_string(m, shop); 1422 print_shop_string (m, shop);
1289 fprintf(fp,"shopitems %s\n", shop); 1423 fprintf (freezer, "shopitems %s\n", shop);
1290 } 1424 }
1425 if (m->shopgreed)
1291 if (m->shopgreed) fprintf(fp,"shopgreed %f\n", m->shopgreed); 1426 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1292#ifndef WIN32 1427 if (m->shopmin)
1293 if (m->shopmin) fprintf(fp,"shopmin %llu\n", m->shopmin); 1428 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1429 if (m->shopmax)
1294 if (m->shopmax) fprintf(fp,"shopmax %llu\n", m->shopmax); 1430 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1295#else 1431 if (m->shoprace)
1296 if (m->shopmin) fprintf(fp,"shopmin %I64u\n", m->shopmin);
1297 if (m->shopmax) fprintf(fp,"shopmax %I64u\n", m->shopmax);
1298#endif
1299 if (m->shoprace) fprintf(fp,"shoprace %s\n", m->shoprace); 1432 fprintf (freezer, "shoprace %s\n", m->shoprace);
1433 if (m->darkness)
1300 if (m->darkness) fprintf(fp,"darkness %d\n", m->darkness); 1434 fprintf (freezer, "darkness %d\n", m->darkness);
1435 if (m->width)
1301 if (m->width) fprintf(fp,"width %d\n", m->width); 1436 fprintf (freezer, "width %d\n", m->width);
1437 if (m->height)
1302 if (m->height) fprintf(fp,"height %d\n", m->height); 1438 fprintf (freezer, "height %d\n", m->height);
1439 if (m->enter_x)
1303 if (m->enter_x) fprintf(fp,"enter_x %d\n", m->enter_x); 1440 fprintf (freezer, "enter_x %d\n", m->enter_x);
1441 if (m->enter_y)
1304 if (m->enter_y) fprintf(fp,"enter_y %d\n", m->enter_y); 1442 fprintf (freezer, "enter_y %d\n", m->enter_y);
1443 if (m->msg)
1305 if (m->msg) fprintf(fp,"msg\n%sendmsg\n", m->msg); 1444 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1445 if (m->maplore)
1306 if (m->maplore) fprintf(fp,"maplore\n%sendmaplore\n", m->maplore); 1446 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1447 if (m->unique)
1307 if (m->unique) fprintf(fp,"unique %d\n", m->unique); 1448 fprintf (freezer, "unique %d\n", m->unique);
1449 if (m->templatemap)
1308 if (m->templatemap) fprintf(fp,"template %d\n", m->templatemap); 1450 fprintf (freezer, "template %d\n", m->templatemap);
1451 if (m->outdoor)
1309 if (m->outdoor) fprintf(fp,"outdoor %d\n", m->outdoor); 1452 fprintf (freezer, "outdoor %d\n", m->outdoor);
1453 if (m->temp)
1310 if (m->temp) fprintf(fp, "temp %d\n", m->temp); 1454 fprintf (freezer, "temp %d\n", m->temp);
1455 if (m->pressure)
1311 if (m->pressure) fprintf(fp, "pressure %d\n", m->pressure); 1456 fprintf (freezer, "pressure %d\n", m->pressure);
1457 if (m->humid)
1312 if (m->humid) fprintf(fp, "humid %d\n", m->humid); 1458 fprintf (freezer, "humid %d\n", m->humid);
1459 if (m->windspeed)
1313 if (m->windspeed) fprintf(fp, "windspeed %d\n", m->windspeed); 1460 fprintf (freezer, "windspeed %d\n", m->windspeed);
1461 if (m->winddir)
1314 if (m->winddir) fprintf(fp, "winddir %d\n", m->winddir); 1462 fprintf (freezer, "winddir %d\n", m->winddir);
1463 if (m->sky)
1315 if (m->sky) fprintf(fp, "sky %d\n", m->sky); 1464 fprintf (freezer, "sky %d\n", m->sky);
1465 if (m->nosmooth)
1316 if (m->nosmooth) fprintf(fp, "nosmooth %d\n", m->nosmooth); 1466 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1317 if (m->safe_map) fprintf(fp, "safe_map %d\n", m->safe_map);
1318 1467
1319 /* Save any tiling information, except on overlays */ 1468 /* Save any tiling information, except on overlays */
1320 if (flag != 2) 1469 if (flag != 2)
1321 for (i=0; i<4; i++) 1470 for (i = 0; i < 4; i++)
1322 if (m->tile_path[i]) 1471 if (m->tile_path[i])
1323 fprintf(fp,"tile_path_%d %s\n", i+1, m->tile_path[i]); 1472 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1324 1473
1474 freezer.put (m);
1325 fprintf(fp,"end\n"); 1475 fprintf (freezer, "end\n");
1326 1476
1327 /* In the game save unique items in the different file, but 1477 /* In the game save unique items in the different file, but
1328 * in the editor save them to the normal map file. 1478 * in the editor save them to the normal map file.
1329 * If unique map, save files in the proper destination (set by 1479 * If unique map, save files in the proper destination (set by
1330 * player) 1480 * player)
1331 */ 1481 */
1332 fp2 = fp; /* save unique items into fp2 */
1333 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) { 1482 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1483 {
1484 object_freezer unique;
1485
1486 if (flag == 2)
1487 save_objects (m, freezer, unique, 2);
1488 else
1489 save_objects (m, freezer, unique, 0);
1490
1334 sprintf (buf,"%s.v00",create_items_path (m->path)); 1491 sprintf (buf, "%s.v00", create_items_path (m->path));
1335 if ((fp2 = fopen (buf, "w")) == NULL) { 1492
1336 LOG(llevError, "Can't open unique items file %s\n", buf); 1493 unique.save (buf);
1337 }
1338 if (flag == 2)
1339 save_objects(m, fp, fp2, 2);
1340 else
1341 save_objects (m, fp, fp2, 0);
1342 if (fp2 != NULL) {
1343 if (ftell (fp2) == 0) {
1344 fclose (fp2);
1345 unlink (buf);
1346 } else {
1347 fclose (fp2);
1348 chmod (buf, SAVE_MODE);
1349 } 1494 }
1350 }
1351 } else { /* save same file when not playing, like in editor */
1352 save_objects(m, fp, fp, 0);
1353 }
1354
1355 if (m->compressed && (m->unique || m->templatemap || flag))
1356 pclose(fp);
1357 else 1495 else
1358 fclose(fp); 1496 { /* save same file when not playing, like in editor */
1497 save_objects (m, freezer, freezer, 0);
1498 }
1359 1499
1360 chmod (filename, SAVE_MODE); 1500 freezer.save (filename);
1501
1361 return 0; 1502 return 0;
1362} 1503}
1363 1504
1364 1505
1365/* 1506/*
1366 * Remove and free all objects in the inventory of the given object. 1507 * Remove and free all objects in the inventory of the given object.
1367 * object.c ? 1508 * object.c ?
1368 */ 1509 */
1369 1510
1511void
1370void clean_object(object *op) 1512clean_object (object *op)
1371{ 1513{
1372 object *tmp, *next; 1514 object *tmp, *next;
1373 1515
1374 for(tmp = op->inv; tmp; tmp = next) 1516 for (tmp = op->inv; tmp; tmp = next)
1375 { 1517 {
1376 next = tmp->below; 1518 next = tmp->below;
1377 clean_object(tmp); 1519 clean_object (tmp);
1378 if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) 1520 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1379 remove_button_link(tmp); 1521 remove_button_link (tmp);
1380 remove_ob(tmp); 1522 tmp->remove ();
1381 free_object(tmp); 1523 tmp->destroy (0);
1382 } 1524 }
1383} 1525}
1384 1526
1385/* 1527/*
1386 * Remove and free all objects in the given map. 1528 * Remove and free all objects in the given map.
1387 */ 1529 */
1388 1530
1531void
1389void free_all_objects(mapstruct *m) { 1532free_all_objects (maptile *m)
1533{
1390 int i,j; 1534 int i, j;
1391 object *op; 1535 object *op;
1392 1536
1393 for(i=0;i<MAP_WIDTH(m);i++) 1537 for (i = 0; i < MAP_WIDTH (m); i++)
1394 for(j=0;j<MAP_HEIGHT(m);j++) { 1538 for (j = 0; j < MAP_HEIGHT (m); j++)
1539 {
1395 object *previous_obj=NULL; 1540 object *previous_obj = NULL;
1541
1396 while((op=GET_MAP_OB(m,i,j))!=NULL) { 1542 while ((op = GET_MAP_OB (m, i, j)) != NULL)
1397 if (op==previous_obj) { 1543 {
1544 if (op == previous_obj)
1545 {
1398 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n"); 1546 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1399 break; 1547 break;
1400 } 1548 }
1401 previous_obj=op; 1549 previous_obj = op;
1402 if(op->head!=NULL) 1550 if (op->head != NULL)
1403 op = op->head; 1551 op = op->head;
1404 1552
1405 /* If the map isn't in memory, free_object will remove and 1553 /* If the map isn't in memory, free_object will remove and
1406 * free objects in op's inventory. So let it do the job. 1554 * free objects in op's inventory. So let it do the job.
1407 */ 1555 */
1408 if (m->in_memory==MAP_IN_MEMORY) 1556 if (m->in_memory == MAP_IN_MEMORY)
1409 clean_object(op); 1557 clean_object (op);
1410 remove_ob(op); 1558 op->remove ();
1411 free_object(op); 1559 op->destroy (0);
1412 } 1560 }
1413 }
1414#ifdef MANY_CORES
1415 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1416 * an item on that map was not saved - look for that condition and die as appropriate -
1417 * this leaves more of the map data intact for better debugging.
1418 */
1419 for (op=objects; op!=NULL; op=op->next) {
1420 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1421 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1422 abort();
1423 }
1424 } 1561 }
1425#endif
1426} 1562}
1427 1563
1428/* 1564/*
1429 * Frees everything allocated by the given mapstructure. 1565 * Frees everything allocated by the given maptileure.
1430 * don't free tmpname - our caller is left to do that 1566 * don't free tmpname - our caller is left to do that
1431 */ 1567 */
1432 1568
1569void
1433void free_map(mapstruct *m,int flag) { 1570free_map (maptile *m, int flag)
1571{
1434 int i; 1572 int i;
1435 1573
1436 if (!m->in_memory) { 1574 if (!m->in_memory)
1575 {
1437 LOG(llevError,"Trying to free freed map.\n"); 1576 LOG (llevError, "Trying to free freed map.\n");
1438 return; 1577 return;
1439 } 1578 }
1440 if (flag && m->spaces) free_all_objects(m); 1579 if (flag && m->spaces)
1580 free_all_objects (m);
1581 if (m->name)
1441 if (m->name) FREE_AND_CLEAR(m->name); 1582 FREE_AND_CLEAR (m->name);
1583 if (m->spaces)
1442 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1584 FREE_AND_CLEAR (m->spaces);
1585 if (m->msg)
1443 if (m->msg) FREE_AND_CLEAR(m->msg); 1586 FREE_AND_CLEAR (m->msg);
1587 if (m->maplore)
1444 if (m->maplore) FREE_AND_CLEAR(m->maplore); 1588 FREE_AND_CLEAR (m->maplore);
1445 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1589 if (m->shopitems)
1590 delete[]m->shopitems;
1591 m->shopitems = 0;
1592 if (m->shoprace)
1446 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1593 FREE_AND_CLEAR (m->shoprace);
1447 if (m->buttons) 1594 if (m->buttons)
1448 free_objectlinkpt(m->buttons); 1595 free_objectlinkpt (m->buttons);
1449 m->buttons = NULL; 1596 m->buttons = NULL;
1450 for (i=0; i<4; i++) { 1597 for (i = 0; i < 4; i++)
1451 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); 1598 {
1599 if (m->tile_path[i])
1600 FREE_AND_CLEAR (m->tile_path[i]);
1452 m->tile_map[i] = NULL; 1601 m->tile_map[i] = NULL;
1453 } 1602 }
1454 m->in_memory = MAP_SWAPPED; 1603 m->in_memory = MAP_SWAPPED;
1455} 1604}
1456 1605
1457/* 1606/*
1458 * function: vanish mapstruct 1607 * function: vanish maptile
1459 * m : pointer to mapstruct, if NULL no action 1608 * m : pointer to maptile, if NULL no action
1460 * this deletes all the data on the map (freeing pointers) 1609 * this deletes all the data on the map (freeing pointers)
1461 * and then removes this map from the global linked list of maps. 1610 * and then removes this map from the global linked list of maps.
1462 */ 1611 */
1463 1612
1464void delete_map(mapstruct *m) { 1613void
1614delete_map (maptile *m)
1615{
1465 mapstruct *tmp, *last; 1616 maptile *tmp, *last;
1466 int i; 1617 int i;
1467 1618
1468 if (!m) 1619 if (!m)
1469 return; 1620 return;
1621
1622 m->clear ();
1623
1470 if (m->in_memory == MAP_IN_MEMORY) { 1624 if (m->in_memory == MAP_IN_MEMORY)
1625 {
1471 /* change to MAP_SAVING, even though we are not, 1626 /* change to MAP_SAVING, even though we are not,
1472 * so that remove_ob doesn't do as much work. 1627 * so that remove_ob doesn't do as much work.
1473 */ 1628 */
1474 m->in_memory = MAP_SAVING; 1629 m->in_memory = MAP_SAVING;
1475 free_map (m, 1); 1630 free_map (m, 1);
1476 } 1631 }
1477 /* move this out of free_map, since tmpname can still be needed if 1632 /* move this out of free_map, since tmpname can still be needed if
1478 * the map is swapped out. 1633 * the map is swapped out.
1479 */ 1634 */
1480 if (m->tmpname) { 1635 if (m->tmpname)
1636 {
1481 free(m->tmpname); 1637 free (m->tmpname);
1482 m->tmpname=NULL; 1638 m->tmpname = NULL;
1483 } 1639 }
1484 last = NULL; 1640 last = NULL;
1485 /* We need to look through all the maps and see if any maps 1641 /* We need to look through all the maps and see if any maps
1486 * are pointing at this one for tiling information. Since 1642 * are pointing at this one for tiling information. Since
1487 * tiling can be assymetric, we just can not look to see which 1643 * tiling can be assymetric, we just can not look to see which
1488 * maps this map tiles with and clears those. 1644 * maps this map tiles with and clears those.
1489 */ 1645 */
1490 for (tmp = first_map; tmp != NULL; tmp = tmp->next) { 1646 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1491 if (tmp->next == m) last = tmp; 1647 {
1648 if (tmp->next == m)
1649 last = tmp;
1492 1650
1493 /* This should hopefully get unrolled on a decent compiler */ 1651 /* This should hopefully get unrolled on a decent compiler */
1494 for (i=0; i<4; i++) 1652 for (i = 0; i < 4; i++)
1495 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL; 1653 if (tmp->tile_map[i] == m)
1654 tmp->tile_map[i] = NULL;
1496 } 1655 }
1497 1656
1498 /* If last is null, then this should be the first map in the list */ 1657 /* If last is null, then this should be the first map in the list */
1499 if (!last) { 1658 if (!last)
1659 {
1500 if (m == first_map) 1660 if (m == first_map)
1501 first_map = m->next; 1661 first_map = m->next;
1502 else 1662 else
1503 /* m->path is a static char, so should hopefully still have 1663 /* m->path is a static char, so should hopefully still have
1504 * some useful data in it. 1664 * some useful data in it.
1505 */ 1665 */
1506 LOG(llevError,"delete_map: Unable to find map %s in list\n", 1666 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1507 m->path);
1508 } 1667 }
1509 else 1668 else
1510 last->next = m->next; 1669 last->next = m->next;
1511 1670
1512 free (m); 1671 delete m;
1513} 1672}
1514 1673
1515 1674
1516 1675
1517/* 1676/*
… …
1524 * dont do any more name translation on it. 1683 * dont do any more name translation on it.
1525 * 1684 *
1526 * Returns a pointer to the given map. 1685 * Returns a pointer to the given map.
1527 */ 1686 */
1528 1687
1688maptile *
1529mapstruct *ready_map_name(const char *name, int flags) { 1689ready_map_name (const char *name, int flags)
1530 mapstruct *m; 1690{
1691 maptile *m;
1531 1692
1532 if (!name) 1693 if (!name)
1533 return (NULL); 1694 return (NULL);
1534 1695
1535 /* Have we been at this level before? */ 1696 /* Have we been at this level before? */
1536 m = has_been_loaded (name); 1697 m = has_been_loaded (name);
1537 1698
1538 /* Map is good to go, so just return it */ 1699 /* Map is good to go, so just return it */
1539 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) { 1700 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1540 return m;
1541 } 1701 {
1702 return m;
1703 }
1542 1704
1543 /* unique maps always get loaded from their original location, and never 1705 /* unique maps always get loaded from their original location, and never
1544 * a temp location. Likewise, if map_flush is set, or we have never loaded 1706 * a temp location. Likewise, if map_flush is set, or we have never loaded
1545 * this map, load it now. I removed the reset checking from here - 1707 * this map, load it now. I removed the reset checking from here -
1546 * it seems the probability of a player trying to enter a map that should 1708 * it seems the probability of a player trying to enter a map that should
1547 * reset but hasn't yet is quite low, and removing that makes this function 1709 * reset but hasn't yet is quite low, and removing that makes this function
1548 * a bit cleaner (and players probably shouldn't rely on exact timing for 1710 * a bit cleaner (and players probably shouldn't rely on exact timing for
1549 * resets in any case - if they really care, they should use the 'maps command. 1711 * resets in any case - if they really care, they should use the 'maps command.
1550 */ 1712 */
1551 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) { 1713 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1714 {
1552 1715
1553 /* first visit or time to reset */ 1716 /* first visit or time to reset */
1554 if (m) { 1717 if (m)
1718 {
1555 clean_tmp_map(m); /* Doesn't make much difference */ 1719 clean_tmp_map (m); /* Doesn't make much difference */
1556 delete_map(m); 1720 delete_map (m);
1557 } 1721 }
1558 1722
1559 /* create and load a map */ 1723 /* create and load a map */
1560 if (flags & MAP_PLAYER_UNIQUE) 1724 if (flags & MAP_PLAYER_UNIQUE)
1561 LOG(llevDebug, "Trying to load map %s.\n", name); 1725 LOG (llevDebug, "Trying to load map %s.\n", name);
1562 else 1726 else
1563 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1727 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1564 1728
1729 //eval_pv ("$x = Event::time", 1);//D
1565 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1730 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1566 return (NULL); 1731 return (NULL);
1732 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1567 1733
1568 fix_auto_apply(m); /* Chests which open as default */ 1734 fix_auto_apply (m); /* Chests which open as default */
1569 1735
1570 /* If a player unique map, no extra unique object file to load. 1736 /* If a player unique map, no extra unique object file to load.
1571 * if from the editor, likewise. 1737 * if from the editor, likewise.
1572 */ 1738 */
1573 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1739 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1574 load_unique_objects(m); 1740 load_unique_objects (m);
1575 1741
1576 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1742 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1743 {
1577 m=load_overlay_map(name, m); 1744 m = load_overlay_map (name, m);
1578 if (m==NULL) 1745 if (m == NULL)
1579 return NULL; 1746 return NULL;
1580 } 1747 }
1581 1748
1582 } else { 1749 if (flags & MAP_PLAYER_UNIQUE)
1750 INVOKE_MAP (SWAPIN, m);
1751
1752 }
1753 else
1754 {
1583 /* If in this loop, we found a temporary map, so load it up. */ 1755 /* If in this loop, we found a temporary map, so load it up. */
1584 1756
1585 m=load_temporary_map (m); 1757 m = load_temporary_map (m);
1758 if (m == NULL)
1586 if(m==NULL) return NULL; 1759 return NULL;
1587 load_unique_objects(m); 1760 load_unique_objects (m);
1588 1761
1589 clean_tmp_map(m); 1762 clean_tmp_map (m);
1590 m->in_memory = MAP_IN_MEMORY; 1763 m->in_memory = MAP_IN_MEMORY;
1591 /* tempnam() on sun systems (probably others) uses malloc 1764 /* tempnam() on sun systems (probably others) uses malloc
1592 * to allocated space for the string. Free it here. 1765 * to allocated space for the string. Free it here.
1593 * In some cases, load_temporary_map above won't find the 1766 * In some cases, load_temporary_map above won't find the
1594 * temporary map, and so has reloaded a new map. If that 1767 * temporary map, and so has reloaded a new map. If that
1595 * is the case, tmpname is now null 1768 * is the case, tmpname is now null
1596 */ 1769 */
1597 if (m->tmpname) free(m->tmpname); 1770 if (m->tmpname)
1771 free (m->tmpname);
1598 m->tmpname = NULL; 1772 m->tmpname = NULL;
1599 /* It's going to be saved anew anyway */ 1773 /* It's going to be saved anew anyway */
1600 } 1774 }
1601 1775
1602 /* Below here is stuff common to both first time loaded maps and 1776 /* Below here is stuff common to both first time loaded maps and
1603 * temp maps. 1777 * temp maps.
1604 */ 1778 */
1605 1779
1606 decay_objects(m); /* start the decay */ 1780 decay_objects (m); /* start the decay */
1607 /* In case other objects press some buttons down */ 1781 /* In case other objects press some buttons down */
1608 update_buttons(m); 1782 update_buttons (m);
1609 if (m->outdoor) 1783 if (m->outdoor)
1610 set_darkness_map(m); 1784 set_darkness_map (m);
1611 /* run the weather over this map */ 1785 /* run the weather over this map */
1612 weather_effect(name); 1786 weather_effect (name);
1613 return m; 1787 return m;
1614} 1788}
1615 1789
1616 1790
1617/* 1791/*
1618 * This routine is supposed to find out the difficulty of the map. 1792 * This routine is supposed to find out the difficulty of the map.
… …
1623 * in the map is zero, then use this routine. Maps should really 1797 * in the map is zero, then use this routine. Maps should really
1624 * have a difficulty set than using this function - human calculation 1798 * have a difficulty set than using this function - human calculation
1625 * is much better than this functions guesswork. 1799 * is much better than this functions guesswork.
1626 */ 1800 */
1627 1801
1802int
1628int calculate_difficulty(mapstruct *m) { 1803calculate_difficulty (maptile *m)
1804{
1629 object *op; 1805 object *op;
1630 archetype *at; 1806 archetype *at;
1631 int x, y, i, diff; 1807 int x, y, i;
1632 long monster_cnt = 0; 1808 long monster_cnt = 0;
1633 double avgexp = 0; 1809 double avgexp = 0;
1634 sint64 total_exp = 0; 1810 sint64 total_exp = 0;
1635 1811
1636 if (MAP_DIFFICULTY (m)) 1812 if (MAP_DIFFICULTY (m))
1637 { 1813 {
1638 LOG(llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1814 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1639 return MAP_DIFFICULTY (m); 1815 return MAP_DIFFICULTY (m);
1640 } 1816 }
1641 1817
1642 for(x = 0; x < MAP_WIDTH(m); x++) 1818 for (x = 0; x < MAP_WIDTH (m); x++)
1643 for(y = 0; y < MAP_HEIGHT(m); y++) 1819 for (y = 0; y < MAP_HEIGHT (m); y++)
1644 for(op = get_map_ob(m, x, y); op != NULL; op = op->above) 1820 for (op = get_map_ob (m, x, y); op != NULL; op = op->above)
1645 { 1821 {
1646 if(QUERY_FLAG (op, FLAG_MONSTER)) 1822 if (QUERY_FLAG (op, FLAG_MONSTER))
1647 { 1823 {
1648 total_exp += op->stats.exp; 1824 total_exp += op->stats.exp;
1649 monster_cnt++; 1825 monster_cnt++;
1650 } 1826 }
1651 1827
1652 if(QUERY_FLAG (op, FLAG_GENERATOR)) 1828 if (QUERY_FLAG (op, FLAG_GENERATOR))
1653 { 1829 {
1654 total_exp += op->stats.exp; 1830 total_exp += op->stats.exp;
1655 at = type_to_archetype(GENERATE_TYPE (op)); 1831 at = type_to_archetype (GENERATE_TYPE (op));
1656 1832
1657 if(at != NULL) 1833 if (at != NULL)
1658 total_exp += at->clone.stats.exp * 8; 1834 total_exp += at->clone.stats.exp * 8;
1659 1835
1660 monster_cnt++; 1836 monster_cnt++;
1661 } 1837 }
1662 } 1838 }
… …
1673 } 1849 }
1674 1850
1675 return 1; 1851 return 1;
1676} 1852}
1677 1853
1678void clean_tmp_map(mapstruct *m) { 1854void
1855clean_tmp_map (maptile *m)
1856{
1679 if(m->tmpname == NULL) 1857 if (m->tmpname == NULL)
1680 return; 1858 return;
1681 if (clean_temporary_map_callback) 1859 INVOKE_MAP (CLEAN, m);
1682 clean_temporary_map_callback (m);
1683 (void) unlink(m->tmpname); 1860 (void) unlink (m->tmpname);
1684} 1861}
1685 1862
1863void
1686void free_all_maps(void) 1864free_all_maps (void)
1687{ 1865{
1688 int real_maps=0; 1866 int real_maps = 0;
1689 1867
1690 while (first_map) { 1868 while (first_map)
1869 {
1691 /* I think some of the callers above before it gets here set this to be 1870 /* I think some of the callers above before it gets here set this to be
1692 * saving, but we still want to free this data 1871 * saving, but we still want to free this data
1693 */ 1872 */
1694 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY; 1873 if (first_map->in_memory == MAP_SAVING)
1874 first_map->in_memory = MAP_IN_MEMORY;
1695 delete_map(first_map); 1875 delete_map (first_map);
1696 real_maps++; 1876 real_maps++;
1697 } 1877 }
1698 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps); 1878 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1699} 1879}
1700 1880
1701/* change_map_light() - used to change map light level (darkness) 1881/* change_map_light() - used to change map light level (darkness)
1702 * up or down. Returns true if successful. It should now be 1882 * up or down. Returns true if successful. It should now be
1703 * possible to change a value by more than 1. 1883 * possible to change a value by more than 1.
1704 * Move this from los.c to map.c since this is more related 1884 * Move this from los.c to map.c since this is more related
1705 * to maps than los. 1885 * to maps than los.
1706 * postive values make it darker, negative make it brighter 1886 * postive values make it darker, negative make it brighter
1707 */ 1887 */
1708 1888
1889int
1709int change_map_light(mapstruct *m, int change) { 1890change_map_light (maptile *m, int change)
1891{
1710 int new_level = m->darkness + change; 1892 int new_level = m->darkness + change;
1711 1893
1712 /* Nothing to do */ 1894 /* Nothing to do */
1713 if(!change || (new_level <= 0 && m->darkness == 0) || 1895 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS))
1714 (new_level >= MAX_DARKNESS && m->darkness >=MAX_DARKNESS)) { 1896 {
1715 return 0; 1897 return 0;
1716 } 1898 }
1717 1899
1718 /* inform all players on the map */ 1900 /* inform all players on the map */
1719 if (change>0) 1901 if (change > 0)
1720 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1902 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker.");
1721 else 1903 else
1722 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1904 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter.");
1723 1905
1724 /* Do extra checking. since m->darkness is a unsigned value, 1906 /* Do extra checking. since m->darkness is a unsigned value,
1725 * we need to be extra careful about negative values. 1907 * we need to be extra careful about negative values.
1726 * In general, the checks below are only needed if change 1908 * In general, the checks below are only needed if change
1727 * is not +/-1 1909 * is not +/-1
1728 */ 1910 */
1729 if (new_level < 0) m->darkness = 0; 1911 if (new_level < 0)
1730 else if (new_level >=MAX_DARKNESS) m->darkness = MAX_DARKNESS; 1912 m->darkness = 0;
1913 else if (new_level >= MAX_DARKNESS)
1914 m->darkness = MAX_DARKNESS;
1915 else
1731 else m->darkness=new_level; 1916 m->darkness = new_level;
1732 1917
1733 /* All clients need to get re-updated for the change */ 1918 /* All clients need to get re-updated for the change */
1734 update_all_map_los(m); 1919 update_all_map_los (m);
1735 return 1; 1920 return 1;
1736} 1921}
1737 1922
1738 1923
1739/* 1924/*
1740 * This function updates various attributes about a specific space 1925 * This function updates various attributes about a specific space
1741 * on the map (what it looks like, whether it blocks magic, 1926 * on the map (what it looks like, whether it blocks magic,
1742 * has a living creatures, prevents people from passing 1927 * has a living creatures, prevents people from passing
1743 * through, etc) 1928 * through, etc)
1744 */ 1929 */
1930void
1745void update_position (mapstruct *m, int x, int y) { 1931update_position (maptile *m, int x, int y)
1932{
1746 object *tmp, *last = NULL; 1933 object *tmp, *last = NULL;
1747 uint8 flags = 0, oldflags, light=0, anywhere=0; 1934 uint8 flags = 0, oldflags, light = 0, anywhere = 0;
1748 New_Face *top,*floor, *middle; 1935 New_Face *top, *floor, *middle;
1749 object *top_obj, *floor_obj, *middle_obj; 1936 object *top_obj, *floor_obj, *middle_obj;
1750 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; 1937 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1751 1938
1752 oldflags = GET_MAP_FLAGS(m,x,y); 1939 oldflags = GET_MAP_FLAGS (m, x, y);
1753 if (!(oldflags & P_NEED_UPDATE)) { 1940 if (!(oldflags & P_NEED_UPDATE))
1941 {
1754 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", 1942 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1755 m->path, x, y); 1943 return;
1756 return;
1757 } 1944 }
1758 1945
1759 middle=blank_face; 1946 middle = blank_face;
1760 top=blank_face; 1947 top = blank_face;
1761 floor=blank_face; 1948 floor = blank_face;
1762 1949
1763 middle_obj = NULL; 1950 middle_obj = NULL;
1764 top_obj = NULL; 1951 top_obj = NULL;
1765 floor_obj = NULL; 1952 floor_obj = NULL;
1766 1953
1767 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { 1954 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above)
1955 {
1768 1956
1769 /* This could be made additive I guess (two lights better than 1957 /* This could be made additive I guess (two lights better than
1770 * one). But if so, it shouldn't be a simple additive - 2 1958 * one). But if so, it shouldn't be a simple additive - 2
1771 * light bulbs do not illuminate twice as far as once since 1959 * light bulbs do not illuminate twice as far as once since
1772 * it is a disapation factor that is squared (or is it cubed?) 1960 * it is a disapation factor that is squared (or is it cubed?)
1773 */ 1961 */
1774 if (tmp->glow_radius > light) light = tmp->glow_radius; 1962 if (tmp->glow_radius > light)
1963 light = tmp->glow_radius;
1775 1964
1776 /* This call is needed in order to update objects the player 1965 /* This call is needed in order to update objects the player
1777 * is standing in that have animations (ie, grass, fire, etc). 1966 * is standing in that have animations (ie, grass, fire, etc).
1778 * However, it also causes the look window to be re-drawn 1967 * However, it also causes the look window to be re-drawn
1779 * 3 times each time the player moves, because many of the 1968 * 3 times each time the player moves, because many of the
1780 * functions the move_player calls eventualy call this. 1969 * functions the move_player calls eventualy call this.
1781 * 1970 *
1782 * Always put the player down for drawing. 1971 * Always put the player down for drawing.
1783 */ 1972 */
1784 if (!tmp->invisible) { 1973 if (!tmp->invisible)
1974 {
1785 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1975 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1786 top = tmp->face; 1976 {
1787 top_obj = tmp; 1977 top = tmp->face;
1788 } 1978 top_obj = tmp;
1979 }
1789 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1980 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1981 {
1790 /* If we got a floor, that means middle and top were below it, 1982 /* If we got a floor, that means middle and top were below it,
1791 * so should not be visible, so we clear them. 1983 * so should not be visible, so we clear them.
1792 */ 1984 */
1793 middle=blank_face; 1985 middle = blank_face;
1794 top=blank_face; 1986 top = blank_face;
1795 floor = tmp->face; 1987 floor = tmp->face;
1796 floor_obj = tmp; 1988 floor_obj = tmp;
1797 } 1989 }
1798 /* Flag anywhere have high priority */ 1990 /* Flag anywhere have high priority */
1799 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 1991 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1800 middle = tmp->face; 1992 {
1993 middle = tmp->face;
1801 1994
1802 middle_obj = tmp; 1995 middle_obj = tmp;
1803 anywhere =1; 1996 anywhere = 1;
1804 } 1997 }
1805 /* Find the highest visible face around. If equal 1998 /* Find the highest visible face around. If equal
1806 * visibilities, we still want the one nearer to the 1999 * visibilities, we still want the one nearer to the
1807 * top 2000 * top
1808 */ 2001 */
1809 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 2002 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
2003 {
1810 middle = tmp->face; 2004 middle = tmp->face;
1811 middle_obj = tmp; 2005 middle_obj = tmp;
1812 } 2006 }
1813 } 2007 }
1814 if (tmp==tmp->above) { 2008 if (tmp == tmp->above)
2009 {
1815 LOG(llevError, "Error in structure of map\n"); 2010 LOG (llevError, "Error in structure of map\n");
1816 exit (-1); 2011 exit (-1);
1817 }
1818 2012 }
2013
1819 move_slow |= tmp->move_slow; 2014 move_slow |= tmp->move_slow;
1820 move_block |= tmp->move_block; 2015 move_block |= tmp->move_block;
1821 move_on |= tmp->move_on; 2016 move_on |= tmp->move_on;
1822 move_off |= tmp->move_off; 2017 move_off |= tmp->move_off;
1823 move_allow |= tmp->move_allow; 2018 move_allow |= tmp->move_allow;
1824 2019
1825 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 2020 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1826 flags |= P_IS_ALIVE; 2021 flags |= P_IS_ALIVE;
1827 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 2022 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1828 flags |= P_NO_MAGIC; 2023 flags |= P_NO_MAGIC;
1829 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 2024 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1830 flags |= P_NO_CLERIC; 2025 flags |= P_NO_CLERIC;
1831 if (tmp->type == SAFE_FLOOR) 2026 if (tmp->type == SAFE_GROUND)
1832 flags |= P_SAFE; 2027 flags |= P_SAFE;
1833 2028
1834 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 2029 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))
1835 flags |= P_BLOCKSVIEW; 2030 flags |= P_BLOCKSVIEW;
1836 } /* for stack of objects */ 2031 } /* for stack of objects */
1837 2032
1838 /* we don't want to rely on this function to have accurate flags, but 2033 /* we don't want to rely on this function to have accurate flags, but
1839 * since we're already doing the work, we calculate them here. 2034 * since we're already doing the work, we calculate them here.
1840 * if they don't match, logic is broken someplace. 2035 * if they don't match, logic is broken someplace.
1841 */ 2036 */
1842 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && 2037 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1843 (!(oldflags & P_NO_ERROR))) { 2038 {
1844 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 2039 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1845 m->path, x, y,
1846 (oldflags & ~P_NEED_UPDATE), flags); 2040 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
1847 } 2041 }
1848 SET_MAP_FLAGS(m, x, y, flags); 2042 SET_MAP_FLAGS (m, x, y, flags);
1849 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); 2043 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow);
1850 SET_MAP_MOVE_ON(m, x, y, move_on); 2044 SET_MAP_MOVE_ON (m, x, y, move_on);
1851 SET_MAP_MOVE_OFF(m, x, y, move_off); 2045 SET_MAP_MOVE_OFF (m, x, y, move_off);
1852 SET_MAP_MOVE_SLOW(m, x, y, move_slow); 2046 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
1853 2047
1854 /* At this point, we have a floor face (if there is a floor), 2048 /* At this point, we have a floor face (if there is a floor),
1855 * and the floor is set - we are not going to touch it at 2049 * and the floor is set - we are not going to touch it at
1856 * this point. 2050 * this point.
1857 * middle contains the highest visibility face. 2051 * middle contains the highest visibility face.
1858 * top contains a player/monster face, if there is one. 2052 * top contains a player/monster face, if there is one.
1859 * 2053 *
1860 * We now need to fill in top.face and/or middle.face. 2054 * We now need to fill in top.face and/or middle.face.
1861 */ 2055 */
1862 2056
1863 /* If the top face also happens to be high visibility, re-do our 2057 /* If the top face also happens to be high visibility, re-do our
1864 * middle face. This should not happen, as we already have the 2058 * middle face. This should not happen, as we already have the
1865 * else statement above so middle should not get set. OTOH, it 2059 * else statement above so middle should not get set. OTOH, it
1866 * may be possible for the faces to match but be different objects. 2060 * may be possible for the faces to match but be different objects.
1867 */ 2061 */
1868 if (top == middle) middle=blank_face; 2062 if (top == middle)
2063 middle = blank_face;
1869 2064
1870 /* There are three posibilities at this point: 2065 /* There are three posibilities at this point:
1871 * 1) top face is set, need middle to be set. 2066 * 1) top face is set, need middle to be set.
1872 * 2) middle is set, need to set top. 2067 * 2) middle is set, need to set top.
1873 * 3) neither middle or top is set - need to set both. 2068 * 3) neither middle or top is set - need to set both.
1874 */ 2069 */
1875 2070
1876 for (tmp=last; tmp; tmp=tmp->below) { 2071 for (tmp = last; tmp; tmp = tmp->below)
2072 {
1877 /* Once we get to a floor, stop, since we already have a floor object */ 2073 /* Once we get to a floor, stop, since we already have a floor object */
1878 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 2074 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2075 break;
1879 2076
1880 /* If two top faces are already set, quit processing */ 2077 /* If two top faces are already set, quit processing */
1881 if ((top != blank_face) && (middle != blank_face)) break; 2078 if ((top != blank_face) && (middle != blank_face))
2079 break;
1882 2080
1883 /* Only show visible faces, unless its the editor - show all */ 2081 /* Only show visible faces, unless its the editor - show all */
1884 if (!tmp->invisible || editor) { 2082 if (!tmp->invisible || editor)
2083 {
1885 /* Fill in top if needed */ 2084 /* Fill in top if needed */
1886 if (top == blank_face) { 2085 if (top == blank_face)
1887 top = tmp->face; 2086 {
1888 top_obj = tmp; 2087 top = tmp->face;
1889 if (top == middle) middle=blank_face; 2088 top_obj = tmp;
1890 } else { 2089 if (top == middle)
2090 middle = blank_face;
2091 }
2092 else
2093 {
1891 /* top is already set - we should only get here if 2094 /* top is already set - we should only get here if
1892 * middle is not set 2095 * middle is not set
1893 * 2096 *
1894 * Set the middle face and break out, since there is nothing 2097 * Set the middle face and break out, since there is nothing
1895 * more to fill in. We don't check visiblity here, since 2098 * more to fill in. We don't check visiblity here, since
1896 * 2099 *
1897 */ 2100 */
1898 if (tmp->face != top ) { 2101 if (tmp->face != top)
1899 middle = tmp->face; 2102 {
1900 middle_obj = tmp; 2103 middle = tmp->face;
1901 break; 2104 middle_obj = tmp;
1902 } 2105 break;
2106 }
2107 }
2108 }
1903 } 2109 }
1904 } 2110 if (middle == floor)
1905 } 2111 middle = blank_face;
1906 if (middle == floor) middle = blank_face; 2112 if (top == middle)
1907 if (top == middle) middle = blank_face; 2113 middle = blank_face;
1908 SET_MAP_FACE(m,x,y,top,0); 2114 SET_MAP_FACE (m, x, y, top, 0);
1909 if(top != blank_face) 2115 if (top != blank_face)
1910 SET_MAP_FACE_OBJ(m,x,y,top_obj,0); 2116 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
1911 else 2117 else
1912 SET_MAP_FACE_OBJ(m,x,y,NULL,0); 2118 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
1913 SET_MAP_FACE(m,x,y,middle,1); 2119 SET_MAP_FACE (m, x, y, middle, 1);
1914 if(middle != blank_face) 2120 if (middle != blank_face)
1915 SET_MAP_FACE_OBJ(m,x,y,middle_obj,1); 2121 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
1916 else 2122 else
1917 SET_MAP_FACE_OBJ(m,x,y,NULL,1); 2123 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
1918 SET_MAP_FACE(m,x,y,floor,2); 2124 SET_MAP_FACE (m, x, y, floor, 2);
1919 if(floor != blank_face) 2125 if (floor != blank_face)
1920 SET_MAP_FACE_OBJ(m,x,y,floor_obj,2); 2126 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
1921 else 2127 else
1922 SET_MAP_FACE_OBJ(m,x,y,NULL,2); 2128 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
1923 SET_MAP_LIGHT(m,x,y,light); 2129 SET_MAP_LIGHT (m, x, y, light);
1924} 2130}
1925 2131
1926 2132
2133void
1927void set_map_reset_time(mapstruct *map) { 2134set_map_reset_time (maptile *map)
2135{
1928 int timeout; 2136 int timeout;
1929 2137
1930 timeout = MAP_RESET_TIMEOUT(map); 2138 timeout = MAP_RESET_TIMEOUT (map);
1931 if (timeout <= 0) 2139 if (timeout <= 0)
1932 timeout = MAP_DEFAULTRESET; 2140 timeout = MAP_DEFAULTRESET;
1933 if (timeout >= MAP_MAXRESET) 2141 if (timeout >= MAP_MAXRESET)
1934 timeout = MAP_MAXRESET; 2142 timeout = MAP_MAXRESET;
1935 MAP_WHEN_RESET(map) = seconds()+timeout; 2143 MAP_WHEN_RESET (map) = seconds () + timeout;
1936} 2144}
1937 2145
1938/* this updates the orig_map->tile_map[tile_num] value after loading 2146/* this updates the orig_map->tile_map[tile_num] value after loading
1939 * the map. It also takes care of linking back the freshly loaded 2147 * the map. It also takes care of linking back the freshly loaded
1940 * maps tile_map values if it tiles back to this one. It returns 2148 * maps tile_map values if it tiles back to this one. It returns
1941 * the value of orig_map->tile_map[tile_num]. It really only does this 2149 * the value of orig_map->tile_map[tile_num]. It really only does this
1942 * so that it is easier for calling functions to verify success. 2150 * so that it is easier for calling functions to verify success.
1943 */ 2151 */
1944 2152
2153static maptile *
1945static mapstruct *load_and_link_tiled_map(mapstruct *orig_map, int tile_num) 2154load_and_link_tiled_map (maptile *orig_map, int tile_num)
1946{ 2155{
1947 int dest_tile = (tile_num +2) % 4; 2156 int dest_tile = (tile_num + 2) % 4;
1948 char *path = path_combine_and_normalize(orig_map->path, orig_map->tile_path[tile_num]); 2157 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1949 2158
1950 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 2159 orig_map->tile_map[tile_num] = ready_map_name (path, 0);
1951 2160
1952 /* need to do a strcmp here as the orig_map->path is not a shared string */ 2161 /* need to do a strcmp here as the orig_map->path is not a shared string */
1953 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 2162 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1954 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1955 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 2163 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1956 2164
1957 return orig_map->tile_map[tile_num]; 2165 return orig_map->tile_map[tile_num];
1958} 2166}
1959 2167
1960/* this returns TRUE if the coordinates (x,y) are out of 2168/* this returns TRUE if the coordinates (x,y) are out of
1961 * map m. This function also takes into account any 2169 * map m. This function also takes into account any
1962 * tiling considerations, loading adjacant maps as needed. 2170 * tiling considerations, loading adjacant maps as needed.
… …
1965 * This function will recursively call itself for the 2173 * This function will recursively call itself for the
1966 * tiled maps. 2174 * tiled maps.
1967 * 2175 *
1968 * 2176 *
1969 */ 2177 */
2178int
1970int out_of_map(mapstruct *m, int x, int y) 2179out_of_map (maptile *m, int x, int y)
1971{ 2180{
1972 2181
1973 /* If we get passed a null map, this is obviously the 2182 /* If we get passed a null map, this is obviously the
1974 * case. This generally shouldn't happen, but if the 2183 * case. This generally shouldn't happen, but if the
1975 * map loads fail below, it could happen. 2184 * map loads fail below, it could happen.
1976 */ 2185 */
1977 if (!m) return 0; 2186 if (!m)
1978
1979 if (x<0) {
1980 if (!m->tile_path[3]) return 1;
1981 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1982 load_and_link_tiled_map(m, 3);
1983 }
1984 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1985 }
1986 if (x>=MAP_WIDTH(m)) {
1987 if (!m->tile_path[1]) return 1;
1988 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1989 load_and_link_tiled_map(m, 1);
1990 }
1991 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
1992 }
1993 if (y<0) {
1994 if (!m->tile_path[0]) return 1;
1995 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
1996 load_and_link_tiled_map(m, 0);
1997 }
1998 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
1999 }
2000 if (y>=MAP_HEIGHT(m)) {
2001 if (!m->tile_path[2]) return 1;
2002 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
2003 load_and_link_tiled_map(m, 2);
2004 }
2005 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
2006 }
2007
2008 /* Simple case - coordinates are within this local
2009 * map.
2010 */
2011 return 0; 2187 return 0;
2188
2189 if (x < 0)
2190 {
2191 if (!m->tile_path[3])
2192 return 1;
2193 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2194 {
2195 load_and_link_tiled_map (m, 3);
2196 }
2197 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));
2198 }
2199 if (x >= MAP_WIDTH (m))
2200 {
2201 if (!m->tile_path[1])
2202 return 1;
2203 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2204 {
2205 load_and_link_tiled_map (m, 1);
2206 }
2207 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2208 }
2209 if (y < 0)
2210 {
2211 if (!m->tile_path[0])
2212 return 1;
2213 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2214 {
2215 load_and_link_tiled_map (m, 0);
2216 }
2217 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));
2218 }
2219 if (y >= MAP_HEIGHT (m))
2220 {
2221 if (!m->tile_path[2])
2222 return 1;
2223 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2224 {
2225 load_and_link_tiled_map (m, 2);
2226 }
2227 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2228 }
2229
2230 /* Simple case - coordinates are within this local
2231 * map.
2232 */
2233 return 0;
2012} 2234}
2013 2235
2014/* This is basically the same as out_of_map above, but 2236/* This is basically the same as out_of_map above, but
2015 * instead we return NULL if no map is valid (coordinates 2237 * instead we return NULL if no map is valid (coordinates
2016 * out of bounds and no tiled map), otherwise it returns 2238 * out of bounds and no tiled map), otherwise it returns
2017 * the map as that the coordinates are really on, and 2239 * the map as that the coordinates are really on, and
2018 * updates x and y to be the localized coordinates. 2240 * updates x and y to be the localized coordinates.
2019 * Using this is more efficient of calling out_of_map 2241 * Using this is more efficient of calling out_of_map
2020 * and then figuring out what the real map is 2242 * and then figuring out what the real map is
2021 */ 2243 */
2244maptile *
2022mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 2245get_map_from_coord (maptile *m, sint16 * x, sint16 * y)
2023{ 2246{
2024 2247
2025 if (*x<0) { 2248 if (*x < 0)
2026 if (!m->tile_path[3]) return NULL; 2249 {
2250 if (!m->tile_path[3])
2251 return NULL;
2027 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2252 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2028 load_and_link_tiled_map(m, 3); 2253 load_and_link_tiled_map (m, 3);
2029 2254
2030 *x += MAP_WIDTH(m->tile_map[3]); 2255 *x += MAP_WIDTH (m->tile_map[3]);
2031 return (get_map_from_coord(m->tile_map[3], x, y)); 2256 return (get_map_from_coord (m->tile_map[3], x, y));
2032 } 2257 }
2033 if (*x>=MAP_WIDTH(m)) { 2258 if (*x >= MAP_WIDTH (m))
2034 if (!m->tile_path[1]) return NULL; 2259 {
2260 if (!m->tile_path[1])
2261 return NULL;
2035 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2262 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2036 load_and_link_tiled_map(m, 1); 2263 load_and_link_tiled_map (m, 1);
2037 2264
2038 *x -= MAP_WIDTH(m); 2265 *x -= MAP_WIDTH (m);
2039 return (get_map_from_coord(m->tile_map[1], x, y)); 2266 return (get_map_from_coord (m->tile_map[1], x, y));
2267 }
2268 if (*y < 0)
2040 } 2269 {
2041 if (*y<0) { 2270 if (!m->tile_path[0])
2042 if (!m->tile_path[0]) return NULL; 2271 return NULL;
2043 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2272 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2044 load_and_link_tiled_map(m, 0); 2273 load_and_link_tiled_map (m, 0);
2045 2274
2046 *y += MAP_HEIGHT(m->tile_map[0]); 2275 *y += MAP_HEIGHT (m->tile_map[0]);
2047 return (get_map_from_coord(m->tile_map[0], x, y)); 2276 return (get_map_from_coord (m->tile_map[0], x, y));
2048 } 2277 }
2049 if (*y>=MAP_HEIGHT(m)) { 2278 if (*y >= MAP_HEIGHT (m))
2050 if (!m->tile_path[2]) return NULL; 2279 {
2280 if (!m->tile_path[2])
2281 return NULL;
2051 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2282 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2052 load_and_link_tiled_map(m, 2); 2283 load_and_link_tiled_map (m, 2);
2053 2284
2054 *y -= MAP_HEIGHT(m); 2285 *y -= MAP_HEIGHT (m);
2055 return (get_map_from_coord(m->tile_map[2], x, y)); 2286 return (get_map_from_coord (m->tile_map[2], x, y));
2056 } 2287 }
2057 2288
2058 /* Simple case - coordinates are within this local 2289 /* Simple case - coordinates are within this local
2059 * map. 2290 * map.
2060 */ 2291 */
2061 2292
2062 return m; 2293 return m;
2063} 2294}
2064 2295
2065/** 2296/**
2066 * Return whether map2 is adjacent to map1. If so, store the distance from 2297 * Return whether map2 is adjacent to map1. If so, store the distance from
2067 * map1 to map2 in dx/dy. 2298 * map1 to map2 in dx/dy.
2068 */ 2299 */
2300static int
2069static int adjacent_map(const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) { 2301adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2302{
2070 if (!map1 || !map2) 2303 if (!map1 || !map2)
2071 return 0; 2304 return 0;
2072 2305
2073 if (map1 == map2) { 2306 if (map1 == map2)
2307 {
2074 *dx = 0; 2308 *dx = 0;
2075 *dy = 0; 2309 *dy = 0;
2076 2310
2311 }
2077 } else if (map1->tile_map[0] == map2) { /* up */ 2312 else if (map1->tile_map[0] == map2)
2313 { /* up */
2078 *dx = 0; 2314 *dx = 0;
2079 *dy = -MAP_HEIGHT(map2); 2315 *dy = -MAP_HEIGHT (map2);
2316 }
2080 } else if (map1->tile_map[1] == map2) { /* right */ 2317 else if (map1->tile_map[1] == map2)
2318 { /* right */
2081 *dx = MAP_WIDTH(map1); 2319 *dx = MAP_WIDTH (map1);
2082 *dy = 0; 2320 *dy = 0;
2321 }
2083 } else if (map1->tile_map[2] == map2) { /* down */ 2322 else if (map1->tile_map[2] == map2)
2323 { /* down */
2084 *dx = 0; 2324 *dx = 0;
2085 *dy = MAP_HEIGHT(map1); 2325 *dy = MAP_HEIGHT (map1);
2326 }
2086 } else if (map1->tile_map[3] == map2) { /* left */ 2327 else if (map1->tile_map[3] == map2)
2328 { /* left */
2087 *dx = -MAP_WIDTH(map2); 2329 *dx = -MAP_WIDTH (map2);
2088 *dy = 0; 2330 *dy = 0;
2089 2331
2332 }
2090 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */ 2333 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2334 { /* up right */
2091 *dx = MAP_WIDTH(map1->tile_map[0]); 2335 *dx = MAP_WIDTH (map1->tile_map[0]);
2092 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2336 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2337 }
2093 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) { /* up left */ 2338 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2339 { /* up left */
2094 *dx = -MAP_WIDTH(map2); 2340 *dx = -MAP_WIDTH (map2);
2095 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2341 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2342 }
2096 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) { /* right up */ 2343 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2344 { /* right up */
2097 *dx = MAP_WIDTH(map1); 2345 *dx = MAP_WIDTH (map1);
2098 *dy = -MAP_HEIGHT(map2); 2346 *dy = -MAP_HEIGHT (map2);
2347 }
2099 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) { /* right down */ 2348 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2349 { /* right down */
2100 *dx = MAP_WIDTH(map1); 2350 *dx = MAP_WIDTH (map1);
2101 *dy = MAP_HEIGHT(map1->tile_map[1]); 2351 *dy = MAP_HEIGHT (map1->tile_map[1]);
2352 }
2102 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) { /* down right */ 2353 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2354 { /* down right */
2103 *dx = MAP_WIDTH(map1->tile_map[2]); 2355 *dx = MAP_WIDTH (map1->tile_map[2]);
2104 *dy = MAP_HEIGHT(map1); 2356 *dy = MAP_HEIGHT (map1);
2357 }
2105 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) { /* down left */ 2358 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2359 { /* down left */
2106 *dx = -MAP_WIDTH(map2); 2360 *dx = -MAP_WIDTH (map2);
2107 *dy = MAP_HEIGHT(map1); 2361 *dy = MAP_HEIGHT (map1);
2362 }
2108 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) { /* left up */ 2363 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2364 { /* left up */
2109 *dx = -MAP_WIDTH(map1->tile_map[3]); 2365 *dx = -MAP_WIDTH (map1->tile_map[3]);
2110 *dy = -MAP_HEIGHT(map2); 2366 *dy = -MAP_HEIGHT (map2);
2367 }
2111 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) { /* left down */ 2368 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2369 { /* left down */
2112 *dx = -MAP_WIDTH(map1->tile_map[3]); 2370 *dx = -MAP_WIDTH (map1->tile_map[3]);
2113 *dy = MAP_HEIGHT(map1->tile_map[3]); 2371 *dy = MAP_HEIGHT (map1->tile_map[3]);
2114 2372
2115 } else { /* not "adjacent" enough */ 2373 }
2374 else
2375 { /* not "adjacent" enough */
2116 return 0; 2376 return 0;
2117 } 2377 }
2118 2378
2119 return 1; 2379 return 1;
2120} 2380}
2121 2381
2122/* From map.c 2382/* From map.c
2123 * This is used by get_player to determine where the other 2383 * This is used by get_player to determine where the other
2124 * creature is. get_rangevector takes into account map tiling, 2384 * creature is. get_rangevector takes into account map tiling,
… …
2138 * 2398 *
2139 * currently, the only flag supported (0x1) is don't translate for 2399 * currently, the only flag supported (0x1) is don't translate for
2140 * closest body part of 'op1' 2400 * closest body part of 'op1'
2141 */ 2401 */
2142 2402
2403void
2143void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) { 2404get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2405{
2144 if (!adjacent_map(op1->map, op2->map, &retval->distance_x, &retval->distance_y)) { 2406 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2407 {
2145 /* be conservative and fill in _some_ data */ 2408 /* be conservative and fill in _some_ data */
2146 retval->distance = 100000; 2409 retval->distance = 100000;
2147 retval->distance_x = 32767; 2410 retval->distance_x = 32767;
2148 retval->distance_y = 32767; 2411 retval->distance_y = 32767;
2149 retval->direction = 0; 2412 retval->direction = 0;
2150 retval->part = 0; 2413 retval->part = 0;
2151 } else { 2414 }
2415 else
2416 {
2152 object *best; 2417 object *best;
2153 2418
2154 retval->distance_x += op2->x-op1->x; 2419 retval->distance_x += op2->x - op1->x;
2155 retval->distance_y += op2->y-op1->y; 2420 retval->distance_y += op2->y - op1->y;
2156 2421
2157 best = op1; 2422 best = op1;
2158 /* If this is multipart, find the closest part now */ 2423 /* If this is multipart, find the closest part now */
2159 if (!(flags&0x1) && op1->more) { 2424 if (!(flags & 0x1) && op1->more)
2425 {
2160 object *tmp; 2426 object *tmp;
2161 int best_distance = retval->distance_x*retval->distance_x+ 2427 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
2162 retval->distance_y*retval->distance_y, tmpi;
2163 2428
2164 /* we just take the offset of the piece to head to figure 2429 /* we just take the offset of the piece to head to figure
2165 * distance instead of doing all that work above again 2430 * distance instead of doing all that work above again
2166 * since the distance fields we set above are positive in the 2431 * since the distance fields we set above are positive in the
2167 * same axis as is used for multipart objects, the simply arithmetic 2432 * same axis as is used for multipart objects, the simply arithmetic
2168 * below works. 2433 * below works.
2169 */ 2434 */
2170 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) { 2435 for (tmp = op1->more; tmp != NULL; tmp = tmp->more)
2436 {
2171 tmpi = (op1->x-tmp->x+retval->distance_x)*(op1->x-tmp->x+retval->distance_x)+ 2437 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
2172 (op1->y-tmp->y+retval->distance_y)*(op1->y-tmp->y+retval->distance_y); 2438 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
2173 if (tmpi < best_distance) { 2439 if (tmpi < best_distance)
2440 {
2174 best_distance = tmpi; 2441 best_distance = tmpi;
2175 best = tmp; 2442 best = tmp;
2176 } 2443 }
2177 } 2444 }
2178 if (best != op1) { 2445 if (best != op1)
2446 {
2179 retval->distance_x += op1->x-best->x; 2447 retval->distance_x += op1->x - best->x;
2180 retval->distance_y += op1->y-best->y; 2448 retval->distance_y += op1->y - best->y;
2181 } 2449 }
2182 } 2450 }
2183 retval->part = best; 2451 retval->part = best;
2184 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2452 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2185 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2453 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2186 } 2454 }
2187} 2455}
2188 2456
2189/* this is basically the same as get_rangevector above, but instead of 2457/* this is basically the same as get_rangevector above, but instead of
2190 * the first parameter being an object, it instead is the map 2458 * the first parameter being an object, it instead is the map
… …
2195 * be more consistant with the above function and also in case they are needed 2463 * be more consistant with the above function and also in case they are needed
2196 * for something in the future. Also, since no object is pasted, the best 2464 * for something in the future. Also, since no object is pasted, the best
2197 * field of the rv_vector is set to NULL. 2465 * field of the rv_vector is set to NULL.
2198 */ 2466 */
2199 2467
2468void
2200void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags) { 2469get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
2470{
2201 if (!adjacent_map(m, op2->map, &retval->distance_x, &retval->distance_y)) { 2471 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2472 {
2202 /* be conservative and fill in _some_ data */ 2473 /* be conservative and fill in _some_ data */
2203 retval->distance = 100000; 2474 retval->distance = 100000;
2204 retval->distance_x = 32767; 2475 retval->distance_x = 32767;
2205 retval->distance_y = 32767; 2476 retval->distance_y = 32767;
2206 retval->direction = 0; 2477 retval->direction = 0;
2207 retval->part = 0; 2478 retval->part = 0;
2208 } else { 2479 }
2480 else
2481 {
2209 retval->distance_x += op2->x-x; 2482 retval->distance_x += op2->x - x;
2210 retval->distance_y += op2->y-y; 2483 retval->distance_y += op2->y - y;
2211 2484
2212 retval->part = NULL; 2485 retval->part = NULL;
2213 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2486 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2214 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2487 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2215 } 2488 }
2216} 2489}
2217 2490
2218/* Returns true of op1 and op2 are effectively on the same map 2491/* Returns true of op1 and op2 are effectively on the same map
2219 * (as related to map tiling). Note that this looks for a path from 2492 * (as related to map tiling). Note that this looks for a path from
… …
2221 * to op1, this will still return false. 2494 * to op1, this will still return false.
2222 * Note we only look one map out to keep the processing simple 2495 * Note we only look one map out to keep the processing simple
2223 * and efficient. This could probably be a macro. 2496 * and efficient. This could probably be a macro.
2224 * MSW 2001-08-05 2497 * MSW 2001-08-05
2225 */ 2498 */
2499int
2226int on_same_map(const object *op1, const object *op2) { 2500on_same_map (const object *op1, const object *op2)
2501{
2227 int dx, dy; 2502 int dx, dy;
2228 2503
2229 return adjacent_map(op1->map, op2->map, &dx, &dy); 2504 return adjacent_map (op1->map, op2->map, &dx, &dy);
2230} 2505}

Diff Legend

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