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

Diff Legend

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