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

Diff Legend

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