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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.27 by root, Fri Sep 8 12:56:42 2006 UTC vs.
Revision 1.36 by root, Mon Dec 11 02:41:25 2006 UTC

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

Diff Legend

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