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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.44 by root, Mon Dec 18 04:07:30 2006 UTC

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

Diff Legend

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