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.8 by root, Sat Aug 26 08:44:04 2006 UTC vs.
Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC

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

Diff Legend

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