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

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

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

Diff Legend

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