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.11 by root, Mon Aug 28 16:12:59 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

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

Diff Legend

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