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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.54 by root, Wed Dec 27 13:13:46 2006 UTC

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

Diff Legend

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