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