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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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