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.26 by pippijn, Thu Sep 7 09:37:12 2006 UTC vs.
Revision 1.40 by root, Tue Dec 12 21:39:56 2006 UTC

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

Diff Legend

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