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.18 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.52 by root, Tue Dec 26 20:04:09 2006 UTC

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

Diff Legend

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