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.6 by elmex, Mon Aug 21 02:55:10 2006 UTC vs.
Revision 1.55 by root, Wed Dec 27 18:09:48 2006 UTC

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

Diff Legend

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