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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.19 by root, Thu Aug 31 18:59:23 2006 UTC vs.
Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC

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

Diff Legend

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