ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.7 by elmex, Mon Aug 21 02:58:22 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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