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.16 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.106 by root, Mon May 28 21:21:40 2007 UTC

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

Diff Legend

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