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.10 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.51 by root, Mon Dec 25 17:11:16 2006 UTC

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

Diff Legend

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