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.6 by elmex, Mon Aug 21 02:55:10 2006 UTC vs.
Revision 1.40 by root, Tue Dec 12 21:39:56 2006 UTC

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

Diff Legend

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