ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/common/map.C
(Generate patch)

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.33 by root, Sun Oct 8 16:51:50 2006 UTC

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

Diff Legend

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