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.5 by elmex, Sun Aug 20 20:57:34 2006 UTC vs.
Revision 1.51 by root, Mon Dec 25 17:11:16 2006 UTC

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

Diff Legend

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