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.23 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.30 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

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