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

Diff Legend

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