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