ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/common/map.C
(Generate patch)

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.37 by pippijn, Mon Dec 11 14:28:12 2006 UTC

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

Diff Legend

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