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.12 by root, Mon Aug 28 16:52:51 2006 UTC vs.
Revision 1.44 by root, Mon Dec 18 04:07:30 2006 UTC

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

Diff Legend

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