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.4 by elmex, Tue Aug 15 18:12:20 2006 UTC vs.
Revision 1.48 by root, Mon Dec 25 14:43:22 2006 UTC

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

Diff Legend

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