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.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.42 by root, Wed Dec 13 02:55:49 2006 UTC

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

Diff Legend

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