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

Diff Legend

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