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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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