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

Diff Legend

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