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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.41 by root, Tue Dec 12 22:37:05 2006 UTC

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

Diff Legend

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