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.30 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

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