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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.6 by elmex, Mon Aug 21 02:55:10 2006 UTC vs.
Revision 1.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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