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.23 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.57 by root, Sat Dec 30 15:07:58 2006 UTC

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

Diff Legend

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