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