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.27 by root, Fri Sep 8 12:56:42 2006 UTC vs.
Revision 1.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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