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

Diff Legend

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