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.9 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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