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.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 2006 UTC

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

Diff Legend

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