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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

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

Diff Legend

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