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.17 by root, Thu Aug 31 06:23:19 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

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