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

Diff Legend

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