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.15 by root, Wed Aug 30 08:28:32 2006 UTC vs.
Revision 1.55 by root, Wed Dec 27 18:09:48 2006 UTC

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

Diff Legend

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