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.26 by pippijn, Thu Sep 7 09:37:12 2006 UTC vs.
Revision 1.33 by root, Sun Oct 8 16:51:50 2006 UTC

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

Diff Legend

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