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.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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