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

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.15 by root, Wed Aug 30 08:28:32 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 2006 UTC

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

Diff Legend

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