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.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

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