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.10 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.40 by root, Tue Dec 12 21:39:56 2006 UTC

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

Diff Legend

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