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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.8 by root, Sat Aug 26 08:44:04 2006 UTC vs.
Revision 1.33 by root, Sun Oct 8 16:51:50 2006 UTC

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

Diff Legend

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