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.16 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.31 by root, Sat Sep 16 22:24:12 2006 UTC

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

Diff Legend

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