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.8 by root, Sat Aug 26 08:44:04 2006 UTC vs.
Revision 1.39 by root, Tue Dec 12 20:53:02 2006 UTC

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

Diff Legend

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