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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.35 by root, Sun Dec 10 01:16:27 2006 UTC

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

Diff Legend

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