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.6 by elmex, Mon Aug 21 02:55:10 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 2006 UTC

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

Diff Legend

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