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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.38 by pippijn, Mon Dec 11 19:46:46 2006 UTC

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

Diff Legend

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