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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.29 by root, Sun Sep 10 16:00:23 2006 UTC

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

Diff Legend

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