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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.47 by root, Mon Dec 25 11:25:49 2006 UTC

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

Diff Legend

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