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.11 by root, Mon Aug 28 16:12:59 2006 UTC vs.
Revision 1.42 by root, Wed Dec 13 02:55:49 2006 UTC

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

Diff Legend

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