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.101 by root, Sat Apr 21 16:56:28 2007 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 18 *
19 * You should have received a copy of the Affero GNU General Public License
20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
22 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <unistd.h> 26#include <unistd.h>
26 27
27#include "global.h" 28#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
31
32#include "path.h" 29#include "path.h"
33 30
34/* 31//+GPL
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47 32
48/* 33sint8 maptile::outdoor_darkness;
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 34
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 38 * new values into newmap, nx, and ny. Any and all of those
… …
125 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0); 60 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
126} 61}
127 62
128/* 63/*
129 * Returns true if the given coordinate is blocked except by the 64 * Returns true if the given coordinate is blocked except by the
130 * object passed is not blocking. This is used with 65 * object passed is not blocking. This is used with
131 * multipart monsters - if we want to see if a 2x2 monster 66 * multipart monsters - if we want to see if a 2x2 monster
132 * can move 1 space to the left, we don't want its own area 67 * can move 1 space to the left, we don't want its own area
133 * to block it from moving there. 68 * to block it from moving there.
134 * Returns TRUE if the space is blocked by something other than the 69 * Returns TRUE if the space is blocked by something other than the
135 * monster. 70 * monster.
… …
138 * by the caller. 73 * by the caller.
139 */ 74 */
140int 75int
141blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
142{ 77{
143 object *tmp;
144 int mflags, blocked;
145
146 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
147 * have already checked this. 79 * have already checked this.
148 */ 80 */
149 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
150 { 82 {
151 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
152 return 1; 84 return 1;
153 } 85 }
154 86
155 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
156 * directly.
157 */
158 mflags = m->at (sx, sy).flags ();
159 88
160 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
161 91
162 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
163 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
164 * things we need to do for players. 94 * things we need to do for players.
165 */ 95 */
166 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
167 return 0; 97 return 0;
168 98
169 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
170 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
171 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
172 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
173 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
174 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
175 */ 105 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 106 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 107 return 0;
178 108
179 if (ob->head != NULL)
180 ob = ob->head; 109 ob = ob->head_ ();
181 110
182 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
186 */ 115 */
187 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.top; tmp; tmp = tmp->below)
188 { 117 {
189 118 if (OB_MOVE_BLOCK (ob, tmp))
190 /* This must be before the checks below. Code for inventory checkers. */
191 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
192 { 119 {
193 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
194 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
195 * pass through this space. 122 return 1;
196 */ 123 else
197 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
198 { 127 {
199 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
200 return 1; 132 return 1;
201 else 133 }
202 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
203 } 143 }
204 else 144 else
205 { 145 return 1; // unconditional block
206 /* In this case, the player must not have the object - 146
207 * if they do, they can't pass through.
208 */
209 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
210 return 1;
211 else
212 continue;
213 }
214 } /* if check_inv */
215 else 147 } else {
216 { 148 // space does not block the ob, directly, but
217 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
218 * this more readable. first check - if the space blocks 150 // blocks anything
219 * movement, can't move here. 151
220 * second - if a monster, can't move there, unles it is a 152 if (tmp->flag [FLAG_ALIVE]
221 * hidden dm 153 && tmp->type != DOOR
222 */ 154 && tmp->head_ () != ob) //TODO: maybe move these check up?
223 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
227 return 1; 155 return 1;
228 } 156 }
229
230 } 157 }
158
231 return 0; 159 return 0;
232} 160}
233 161
234/* 162/*
235 * Returns true if the given object can't fit in the given spot. 163 * Returns the blocking object if the given object can't fit in the given
236 * This is meant for multi space objects - for single space objecs, 164 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 166 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
240 * 168 *
241 * While this doesn't call out of map, the get_map_flags does. 169 * While this doesn't call out of map, the get_map_flags does.
242 * 170 *
243 * This function has been used to deprecate arch_out_of_map - 171 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 172 * this function also does that check, and since in most cases,
… …
255 * 183 *
256 * Note this used to be arch_blocked, but with new movement 184 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 185 * code, we need to have actual object to check its move_type
258 * against the move_block values. 186 * against the move_block values.
259 */ 187 */
260int 188bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 189object::blocked (maptile *m, int x, int y) const
262{ 190{
263 archetype *tmp; 191 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
264 int flag;
265 maptile *m1;
266 sint16 sx, sy;
267
268 if (!ob)
269 {
270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
271 if (flag & P_OUT_OF_MAP)
272 return P_OUT_OF_MAP;
273
274 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block;
276 } 192 {
193 mapxy pos (m, x + tmp->x, y + tmp->y);
277 194
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 195 if (!pos.normalise ())
279 { 196 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 197
282 if (flag & P_OUT_OF_MAP) 198 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 199
284 if (flag & P_IS_ALIVE) 200 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 201 return 1;
286 202
287 mapspace &ms = m1->at (sx, sy); 203 /* However, often ob doesn't have any move type
288 204 * (signifying non-moving objects)
289 /* find_first_free_spot() calls this function. However, often
290 * ob doesn't have any move type (when used to place exits)
291 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 205 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 206 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 207 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 208 continue;
296 209
297 /* Note it is intentional that we check ob - the movement type of the 210 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 211 * head of the object should correspond for the entire object.
299 */ 212 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 213 if (ms.blocks (move_type))
301 return P_NO_PASS; 214 return 1;
302 } 215 }
303 216
304 return 0; 217 return 0;
305} 218}
306 219
307/* When the map is loaded, load_object does not actually insert objects 220//-GPL
308 * into inventory, but just links them. What this does is go through
309 * and insert them properly.
310 * The object 'container' is the object that contains the inventory.
311 * This is needed so that we can update the containers weight.
312 */
313void
314fix_container (object *container)
315{
316 object *tmp = container->inv, *next;
317
318 container->inv = 0;
319 while (tmp)
320 {
321 next = tmp->below;
322 if (tmp->inv)
323 fix_container (tmp);
324
325 insert_ob_in_ob (tmp, container);
326 tmp = next;
327 }
328
329 /* sum_weight will go through and calculate what all the containers are
330 * carrying.
331 */
332 sum_weight (container);
333}
334 221
335void 222void
336maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
337{ 224{
338 if (!spaces) 225 if (!spaces)
… …
340 227
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 228 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 229 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 230 tmp->flag [flag] = value;
344} 231}
232
233void
234maptile::post_load_original ()
235{
236 if (!spaces)
237 return;
238
239 set_object_flag (FLAG_OBJ_ORIGINAL);
240
241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
243 INVOKE_OBJECT (RESET, tmp);
244}
245
246void
247maptile::post_load ()
248{
249#if 0
250 if (!spaces)
251 return;
252
253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
255 ; // nop
256#endif
257}
258
259//+GPL
345 260
346/* link_multipart_objects go through all the objects on the map looking 261/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 262 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 263 * info we have, they only have the head (as would be expected when
349 * they are saved). 264 * they are saved).
… …
353{ 268{
354 if (!spaces) 269 if (!spaces)
355 return; 270 return;
356 271
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 272 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *op = ms->bot; op; op = op->above) 273 {
274 object *op = ms->bot;
275 while (op)
359 { 276 {
360 /* already multipart - don't do anything more */ 277 /* already multipart - don't do anything more */
361 if (!op->head && !op->more && op->arch->more) 278 if (op->head_ () == op && !op->more && op->arch->more)
362 { 279 {
363 op->remove (); 280 op->remove ();
364 op->expand_tail (); 281 op->expand_tail ();
282
283 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
284 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
285 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
365 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 286 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
287
288 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
289 // so we have to reset the iteration through the mapspace
366 } 290 }
291 else
292 op = op->above;
367 } 293 }
294 }
368} 295}
296
297//-GPL
369 298
370/* 299/*
371 * Loads (ands parses) the objects into a given map from the specified 300 * Loads (ands parses) the objects into a given map from the specified
372 * file pointer. 301 * file pointer.
373 */ 302 */
374bool 303bool
375maptile::_load_objects (object_thawer &f) 304maptile::_load_objects (object_thawer &f)
376{ 305{
377 for (;;) 306 for (;;)
378 { 307 {
379 coroapi::cede_to_tick_every (100); // cede once in a while 308 coroapi::cede_to_tick (); // cede once in a while
380 309
381 switch (f.kw) 310 switch (f.kw)
382 { 311 {
383 case KW_arch: 312 case KW_arch:
384 if (object *op = object::read (f, this)) 313 if (object *op = object::read (f, this))
385 { 314 {
315 // TODO: why?
386 if (op->inv) 316 if (op->inv)
317 {
318 op->carrying = 0;
387 sum_weight (op); 319 op->update_weight ();
320 }
388 321
389 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) it's correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 *(ms.top ? &ms.top->above : &ms.bot) = op;
336
337 ms.top = op;
338 ms.flags_ = 0;
339 }
340 else
341 {
342 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
343 op->destroy ();
344 }
390 } 345 }
391 346
392 continue; 347 continue;
393 348
394 case KW_EOF: 349 case KW_EOF:
… …
407} 362}
408 363
409void 364void
410maptile::activate () 365maptile::activate ()
411{ 366{
412 active = true; 367 if (state != MAP_INACTIVE)
368 return;
413 369
414 if (spaces)
415 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
416 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
417 op->activate_recursive (); 372 op->activate_recursive ();
373
374 state = MAP_ACTIVE;
375
376 activate_physics ();
418} 377}
419 378
420void 379void
421maptile::deactivate () 380maptile::deactivate ()
422{ 381{
423 active = false; 382 if (state != MAP_ACTIVE)
383 return;
424 384
425 if (spaces)
426 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 385 for (mapspace *ms = spaces + size (); ms-- > spaces; )
427 for (object *op = ms->bot; op; op = op->above) 386 for (object *op = ms->bot; op; op = op->above)
428 op->deactivate_recursive (); 387 op->deactivate_recursive ();
388
389 state = MAP_INACTIVE;
429} 390}
430 391
431bool 392bool
432maptile::_save_objects (object_freezer &f, int flags) 393maptile::_save_objects (object_freezer &f, int flags)
433{ 394{
… …
439 if (!spaces) 400 if (!spaces)
440 return false; 401 return false;
441 402
442 for (int i = 0; i < size (); ++i) 403 for (int i = 0; i < size (); ++i)
443 { 404 {
444 int unique = 0; 405 bool unique = 0;
406
445 for (object *op = spaces [i].bot; op; op = op->above) 407 for (object *op = spaces [i].bot; op; op = op->above)
446 { 408 {
447 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 409 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
448 unique = 1;
449 410
450 if (!op->can_map_save ()) 411 if (ecb_expect_false (!op->can_map_save ()))
451 continue; 412 continue;
452 413
453 if (unique || op->flag [FLAG_UNIQUE]) 414 if (ecb_expect_false (unique || op->flag [FLAG_UNIQUE]))
454 { 415 {
455 if (flags & IO_UNIQUES) 416 if (flags & IO_UNIQUES)
456 op->write (f); 417 op->write (f);
457 } 418 }
458 else if (flags & IO_OBJECTS) 419 else if (ecb_expect_true (flags & IO_OBJECTS))
459 op->write (f); 420 op->write (f);
460 } 421 }
461 } 422 }
462 423
463 coroapi::cede_to_tick (); 424 coroapi::cede_to_tick ();
464 425
465 return true; 426 return true;
466} 427}
467 428
468bool 429bool
469maptile::_load_objects (const char *path, bool skip_header)
470{
471 object_thawer f (path);
472
473 if (!f)
474 return false;
475
476 f.next ();
477
478 if (skip_header)
479 for (;;)
480 {
481 keyword kw = f.kw;
482 f.skip ();
483 if (kw == KW_end)
484 break;
485 }
486
487 return _load_objects (f);
488}
489
490bool
491maptile::_save_objects (const char *path, int flags) 430maptile::_save_objects (const char *path, int flags)
492{ 431{
493 object_freezer freezer; 432 object_freezer freezer;
494 433
495 if (!_save_objects (freezer, flags)) 434 if (!_save_objects (freezer, flags))
496 return false; 435 return false;
497 436
498 return freezer.save (path); 437 return freezer.save (path);
499} 438}
500 439
501maptile::maptile () 440void
441maptile::init ()
502{ 442{
503 in_memory = MAP_SWAPPED; 443 state = MAP_SWAPPED;
504 444
505 /* The maps used to pick up default x and y values from the 445 /* The maps used to pick up default x and y values from the
506 * map archetype. Mimic that behaviour. 446 * map archetype. Mimic that behaviour.
507 */ 447 */
508 width = 16; 448 width = 16;
509 height = 16; 449 height = 16;
510 timeout = 300; 450 timeout = 300;
511 max_nrof = 1000; // 1000 items of anything 451 max_items = MAX_ITEM_PER_ACTION;
512 max_volume = 2000000; // 2m³ 452 max_volume = 2000000; // 2m³
513}
514
515maptile::maptile (int w, int h)
516{
517 in_memory = MAP_SWAPPED;
518
519 width = w;
520 height = h;
521 reset_timeout = 0; 453 reset_timeout = 0;
522 timeout = 300;
523 enter_x = 0; 454 enter_x = 0;
524 enter_y = 0; 455 enter_y = 0;
456}
457
458maptile::maptile ()
459{
460 init ();
461}
462
463maptile::maptile (int w, int h)
464{
465 init ();
466
467 width = w;
468 height = h;
525 469
526 alloc (); 470 alloc ();
527} 471}
528 472
529/* 473/*
… …
538 return; 482 return;
539 483
540 spaces = salloc0<mapspace> (size ()); 484 spaces = salloc0<mapspace> (size ());
541} 485}
542 486
487//+GPL
488
543/* Takes a string from a map definition and outputs a pointer to the array of shopitems 489/* Takes a string from a map definition and outputs a pointer to the array of shopitems
544 * corresponding to that string. Memory is allocated for this, it must be freed 490 * corresponding to that string. Memory is allocated for this, it must be freed
545 * at a later date. 491 * at a later date.
546 * Called by parse_map_headers below. 492 * Called by parse_map_headers below.
547 */ 493 */
548static shopitems * 494static shopitems *
549parse_shop_string (const char *input_string) 495parse_shop_string (const char *input_string)
… …
598 *q = '\0'; 544 *q = '\0';
599 545
600 current_type = get_typedata_by_name (p); 546 current_type = get_typedata_by_name (p);
601 if (current_type) 547 if (current_type)
602 { 548 {
603 items[i].name = current_type->name; 549 items[i].name = current_type->name;
604 items[i].typenum = current_type->number; 550 items[i].typenum = current_type->number;
605 items[i].name_pl = current_type->name_pl; 551 items[i].name_pl = current_type->name_pl;
606 } 552 }
607 else 553 else
608 { /* oh uh, something's wrong, let's free up this one, and try 554 { /* oh uh, something's wrong, let's free up this one, and try
609 * the next entry while we're at it, better print a warning 555 * the next entry while we're at it, better print a warning
610 */ 556 */
611 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 557 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
612 } 558 }
613 } 559 }
614 560
… …
623 return items; 569 return items;
624} 570}
625 571
626/* opposite of parse string, this puts the string that was originally fed in to 572/* opposite of parse string, this puts the string that was originally fed in to
627 * the map (or something equivilent) into output_string. */ 573 * the map (or something equivilent) into output_string. */
628static void 574static const char *
629print_shop_string (maptile *m, char *output_string) 575print_shop_string (maptile *m)
630{ 576{
631 int i; 577 static dynbuf_text buf; buf.clear ();
632 char tmp[MAX_BUF]; 578 bool first = true;
633 579
634 strcpy (output_string, "");
635 for (i = 0; i < m->shopitems[0].index; i++) 580 for (int i = 0; i < m->shopitems[0].index; i++)
636 { 581 {
582 if (!first)
583 buf << ';';
584
585 first = false;
586
637 if (m->shopitems[i].typenum) 587 if (m->shopitems[i].typenum)
638 { 588 {
639 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
640 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 590 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
641 else 591 else
642 sprintf (tmp, "%s;", m->shopitems[i].name); 592 buf.printf ("%s", m->shopitems[i].name);
643 } 593 }
644 else 594 else
645 { 595 {
646 if (m->shopitems[i].strength) 596 if (m->shopitems[i].strength)
647 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 597 buf.printf ("*:%d", m->shopitems[i].strength);
648 else 598 else
649 sprintf (tmp, "*"); 599 buf.printf ("*");
650 } 600 }
651
652 strcat (output_string, tmp);
653 } 601 }
602
603 return buf;
654} 604}
605
606//-GPL
655 607
656/* This loads the header information of the map. The header 608/* This loads the header information of the map. The header
657 * contains things like difficulty, size, timeout, etc. 609 * contains things like difficulty, size, timeout, etc.
658 * this used to be stored in the map object, but with the 610 * this used to be stored in the map object, but with the
659 * addition of tiling, fields beyond that easily named in an 611 * addition of tiling, fields beyond that easily named in an
… …
667bool 619bool
668maptile::_load_header (object_thawer &thawer) 620maptile::_load_header (object_thawer &thawer)
669{ 621{
670 for (;;) 622 for (;;)
671 { 623 {
672 keyword kw = thawer.get_kv ();
673
674 switch (kw) 624 switch (thawer.kw)
675 { 625 {
676 case KW_msg: 626 case KW_msg:
677 thawer.get_ml (KW_endmsg, msg); 627 thawer.get_ml (KW_endmsg, msg);
678 break; 628 break;
679 629
680 case KW_lore: // CF+ extension 630 case KW_lore: // deliantra extension
681 thawer.get_ml (KW_endlore, maplore); 631 thawer.get_ml (KW_endlore, maplore);
682 break; 632 break;
683 633
684 case KW_maplore: 634 case KW_maplore:
685 thawer.get_ml (KW_endmaplore, maplore); 635 thawer.get_ml (KW_endmaplore, maplore);
… …
702 case KW_shopgreed: thawer.get (shopgreed); break; 652 case KW_shopgreed: thawer.get (shopgreed); break;
703 case KW_shopmin: thawer.get (shopmin); break; 653 case KW_shopmin: thawer.get (shopmin); break;
704 case KW_shopmax: thawer.get (shopmax); break; 654 case KW_shopmax: thawer.get (shopmax); break;
705 case KW_shoprace: thawer.get (shoprace); break; 655 case KW_shoprace: thawer.get (shoprace); break;
706 case KW_outdoor: thawer.get (outdoor); break; 656 case KW_outdoor: thawer.get (outdoor); break;
707 case KW_temp: thawer.get (temp); break;
708 case KW_pressure: thawer.get (pressure); break;
709 case KW_humid: thawer.get (humid); break;
710 case KW_windspeed: thawer.get (windspeed); break;
711 case KW_winddir: thawer.get (winddir); break;
712 case KW_sky: thawer.get (sky); break;
713 657
714 case KW_per_player: thawer.get (per_player); break; 658 case KW_per_player: thawer.get (per_player); break;
715 case KW_per_party: thawer.get (per_party); break; 659 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break;
661 case KW_no_drop: thawer.get (no_drop); break;
716 662
717 case KW_region: default_region = region::find (thawer.get_str ()); break; 663 case KW_region: thawer.get (default_region); break;
718 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 664 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
719 665
720 // old names new names 666 // old names new names
721 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 667 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
722 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 668 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
726 case KW_value: case KW_swap_time: thawer.get (timeout); break; 672 case KW_value: case KW_swap_time: thawer.get (timeout); break;
727 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; 673 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
728 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 674 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
729 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; 675 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
730 676
731 case KW_tile_path_1: thawer.get (tile_path [0]); break; 677 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
732 case KW_tile_path_2: thawer.get (tile_path [1]); break; 678 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
733 case KW_tile_path_3: thawer.get (tile_path [2]); break; 679 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
734 case KW_tile_path_4: thawer.get (tile_path [3]); break; 680 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
681 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
682 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
683
684 case KW_ERROR:
685 set_key_text (thawer.kw_str, thawer.value);
686 break;
735 687
736 case KW_end: 688 case KW_end:
689 thawer.next ();
737 return true; 690 return true;
738 691
739 default: 692 default:
740 if (!thawer.parse_error ("map", 0)) 693 if (!thawer.parse_error ("map"))
741 return false; 694 return false;
742 break; 695 break;
743 } 696 }
697
698 thawer.next ();
744 } 699 }
745 700
746 abort (); 701 abort ();
747} 702}
748 703
749bool 704//+GPL
750maptile::_load_header (const char *path)
751{
752 object_thawer thawer (path);
753
754 if (!thawer)
755 return false;
756
757 return _load_header (thawer);
758}
759 705
760/****************************************************************************** 706/******************************************************************************
761 * This is the start of unique map handling code 707 * This is the start of unique map handling code
762 *****************************************************************************/ 708 *****************************************************************************/
763 709
… …
770 int unique = 0; 716 int unique = 0;
771 for (object *op = spaces [i].bot; op; ) 717 for (object *op = spaces [i].bot; op; )
772 { 718 {
773 object *above = op->above; 719 object *above = op->above;
774 720
775 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 721 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
776 unique = 1; 722 unique = 1;
777 723
778 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 724 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
779 {
780 op->destroy_inv (false);
781 op->destroy (); 725 op->destroy ();
782 }
783 726
784 op = above; 727 op = above;
785 } 728 }
786 } 729 }
787} 730}
788 731
732//-GPL
733
789bool 734bool
790maptile::_save_header (object_freezer &freezer) 735maptile::_save_header (object_freezer &freezer)
791{ 736{
792#define MAP_OUT(k) freezer.put (KW_ ## k, k) 737#define MAP_OUT(k) freezer.put (KW(k), k)
793#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 738#define MAP_OUT2(k,v) freezer.put (KW(k), v)
794 739
795 MAP_OUT2 (arch, "map"); 740 MAP_OUT2 (arch, CS(map));
796 741
797 if (name) MAP_OUT (name); 742 if (name) MAP_OUT (name);
798 MAP_OUT (swap_time); 743 MAP_OUT (swap_time);
799 MAP_OUT (reset_time); 744 MAP_OUT (reset_time);
800 MAP_OUT (reset_timeout); 745 MAP_OUT (reset_timeout);
801 MAP_OUT (fixed_resettime); 746 MAP_OUT (fixed_resettime);
747 MAP_OUT (no_reset);
748 MAP_OUT (no_drop);
802 MAP_OUT (difficulty); 749 MAP_OUT (difficulty);
803
804 if (default_region) MAP_OUT2 (region, default_region->name); 750 if (default_region) MAP_OUT2 (region, default_region->name);
805 751
806 if (shopitems) 752 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
807 {
808 char shop[MAX_BUF];
809 print_shop_string (this, shop);
810 MAP_OUT2 (shopitems, shop);
811 }
812
813 MAP_OUT (shopgreed); 753 MAP_OUT (shopgreed);
814 MAP_OUT (shopmin); 754 MAP_OUT (shopmin);
815 MAP_OUT (shopmax); 755 MAP_OUT (shopmax);
816 if (shoprace) MAP_OUT (shoprace); 756 if (shoprace) MAP_OUT (shoprace);
817 MAP_OUT (darkness); 757
818 MAP_OUT (width); 758 MAP_OUT (width);
819 MAP_OUT (height); 759 MAP_OUT (height);
820 MAP_OUT (enter_x); 760 MAP_OUT (enter_x);
821 MAP_OUT (enter_y); 761 MAP_OUT (enter_y);
822 762 MAP_OUT (darkness);
823 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
824 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
825
826 MAP_OUT (outdoor); 763 MAP_OUT (outdoor);
827 MAP_OUT (temp); 764
828 MAP_OUT (pressure); 765 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
829 MAP_OUT (humid); 766 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
830 MAP_OUT (windspeed);
831 MAP_OUT (winddir);
832 MAP_OUT (sky);
833 767
834 MAP_OUT (per_player); 768 MAP_OUT (per_player);
835 MAP_OUT (per_party); 769 MAP_OUT (per_party);
836 770
837 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 771 if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
838 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 772 if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
839 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 773 if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
840 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 774 if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
775 if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
776 if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
841 777
842 freezer.put (this); 778 freezer.put (this);
843 freezer.put (KW_end); 779 freezer.put (KW(end));
844 780
845 return true; 781 return true;
846} 782}
847 783
848bool 784bool
… …
854 return false; 790 return false;
855 791
856 return freezer.save (path); 792 return freezer.save (path);
857} 793}
858 794
795//+GPL
796
859/* 797/*
860 * Remove and free all objects in the given map. 798 * Remove and free all objects in the given map.
861 */ 799 */
862void 800void
863maptile::clear () 801maptile::clear ()
864{ 802{
865 sfree (regions, size ()), regions = 0;
866 free (regionmap), regionmap = 0;
867
868 if (spaces) 803 if (spaces)
869 { 804 {
870 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 805 for (mapspace *ms = spaces + size (); ms-- > spaces; )
871 while (object *op = ms->bot) 806 while (object *op = ms->bot)
872 { 807 {
808 // manually remove, as to not trigger anything
809 if (ms->bot = op->above)
810 ms->bot->below = 0;
811
812 op->flag [FLAG_REMOVED] = true;
813
814 object *head = op->head_ ();
873 if (op->head) 815 if (op == head)
874 op = op->head;
875
876 op->destroy_inv (false);
877 op->destroy (); 816 op->destroy ();
817 else if (head->map != op->map)
818 {
819 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
820 head->destroy ();
821 }
878 } 822 }
879 823
880 sfree (spaces, size ()), spaces = 0; 824 sfree0 (spaces, size ());
881 } 825 }
882 826
883 if (buttons) 827 if (buttons)
884 free_objectlinkpt (buttons), buttons = 0; 828 free_objectlinkpt (buttons), buttons = 0;
829
830 sfree0 (regions, size ());
831 delete [] regionmap; regionmap = 0;
885} 832}
886 833
887void 834void
888maptile::clear_header () 835maptile::clear_header ()
889{ 836{
… …
891 msg = 0; 838 msg = 0;
892 maplore = 0; 839 maplore = 0;
893 shoprace = 0; 840 shoprace = 0;
894 delete [] shopitems, shopitems = 0; 841 delete [] shopitems, shopitems = 0;
895 842
896 for (int i = 0; i < 4; i++) 843 for (int i = 0; i < ecb_array_length (tile_path); i++)
897 tile_path [i] = 0; 844 tile_path [i] = 0;
898} 845}
899 846
900maptile::~maptile () 847maptile::~maptile ()
901{ 848{
… …
908 /* We need to look through all the maps and see if any maps 855 /* We need to look through all the maps and see if any maps
909 * are pointing at this one for tiling information. Since 856 * are pointing at this one for tiling information. Since
910 * tiling can be asymetric, we just can not look to see which 857 * tiling can be asymetric, we just can not look to see which
911 * maps this map tiles with and clears those. 858 * maps this map tiles with and clears those.
912 */ 859 */
913 for (int i = 0; i < 4; i++) 860 for (int i = 0; i < ecb_array_length (tile_path); i++)
914 if (tile_map[i] == m) 861 if (tile_map[i] == m)
915 tile_map[i] = 0; 862 tile_map[i] = 0;
916} 863}
917 864
918void 865void
… …
921 attachable::do_destroy (); 868 attachable::do_destroy ();
922 869
923 clear (); 870 clear ();
924} 871}
925 872
926/* 873/* decay and destroy perishable items in a map */
927 * Updates every button on the map (by calling update_button() for them). 874// TODO: should be done regularly, not on map load?
928 */
929void 875void
930maptile::update_buttons () 876maptile::do_decay_objects ()
931{ 877{
932 for (oblinkpt *obp = buttons; obp; obp = obp->next) 878 if (!spaces)
933 for (objectlink *ol = obp->link; ol; ol = ol->next) 879 return;
880
881 for (mapspace *ms = spaces + size (); ms-- > spaces; )
882 for (object *above, *op = ms->bot; op; op = above)
934 { 883 {
935 if (!ol->ob) 884 above = op->above;
885
886 // do not decay anything above unique floor tiles (yet :)
887 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
888 break;
889
890 bool destroy = 0;
891
892 if (op->flag [FLAG_IS_FLOOR]
893 || op->flag [FLAG_OBJ_ORIGINAL]
894 || op->flag [FLAG_UNIQUE]
895 || op->flag [FLAG_OVERLAY_FLOOR]
896 || op->flag [FLAG_UNPAID]
897 || op->is_alive ())
898 ; // do not decay
899 else if (op->is_weapon ())
936 { 900 {
937 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 901 op->stats.dam--;
938 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 902 if (op->stats.dam < 0)
939 continue; 903 destroy = 1;
940 } 904 }
941 905 else if (op->is_armor ())
942 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
943 { 906 {
944 update_button (ol->ob); 907 op->stats.ac--;
945 break; 908 if (op->stats.ac < 0)
909 destroy = 1;
946 } 910 }
911 else if (op->type == FOOD)
912 {
913 op->stats.food -= rndm (5, 20);
914 if (op->stats.food < 0)
915 destroy = 1;
916 }
917 else
918 {
919 int mat = op->materials;
920
921 if (mat & M_PAPER
922 || mat & M_LEATHER
923 || mat & M_WOOD
924 || mat & M_ORGANIC
925 || mat & M_CLOTH
926 || mat & M_LIQUID
927 || (mat & M_IRON && rndm (1, 5) == 1)
928 || (mat & M_GLASS && rndm (1, 2) == 1)
929 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
930 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
931 //|| (mat & M_ICE && temp > 32)
932 )
933 destroy = 1;
934 }
935
936 /* adjust overall chance below */
937 if (destroy && rndm (0, 1))
938 op->destroy ();
947 } 939 }
948} 940}
949 941
950/* 942/*
951 * This routine is supposed to find out the difficulty of the map. 943 * This routine is supposed to find out the difficulty of the map.
952 * difficulty does not have a lot to do with character level, 944 * difficulty does not have a lot to do with character level,
953 * but does have a lot to do with treasure on the map. 945 * but does have a lot to do with treasure on the map.
954 * 946 *
955 * Difficulty can now be set by the map creature. If the value stored 947 * Difficulty can now be set by the map creator. If the value stored
956 * in the map is zero, then use this routine. Maps should really 948 * in the map is zero, then use this routine. Maps should really
957 * have a difficulty set than using this function - human calculation 949 * have a difficulty set rather than using this function - human calculation
958 * is much better than this functions guesswork. 950 * is much better than this function's guesswork.
959 */ 951 */
960int 952int
961maptile::estimate_difficulty () const 953maptile::estimate_difficulty () const
962{ 954{
963 long monster_cnt = 0; 955 long monster_cnt = 0;
… …
965 sint64 total_exp = 0; 957 sint64 total_exp = 0;
966 958
967 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 959 for (mapspace *ms = spaces + size (); ms-- > spaces; )
968 for (object *op = ms->bot; op; op = op->above) 960 for (object *op = ms->bot; op; op = op->above)
969 { 961 {
970 if (QUERY_FLAG (op, FLAG_MONSTER)) 962 if (op->flag [FLAG_MONSTER])
971 { 963 {
972 total_exp += op->stats.exp; 964 total_exp += op->stats.exp;
973 monster_cnt++; 965 monster_cnt++;
974 } 966 }
975 967
976 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (op->flag [FLAG_GENERATOR])
977 { 969 {
978 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
979 971
980 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 972 if (archetype *at = op->other_arch)
973 {
981 total_exp += at->clone.stats.exp * 8; 974 total_exp += at->stats.exp * 8;
982
983 monster_cnt++; 975 monster_cnt++;
976 }
977
978 for (object *inv = op->inv; inv; inv = inv->below)
979 {
980 total_exp += op->stats.exp * 8;
981 monster_cnt++;
982 }
984 } 983 }
985 } 984 }
986 985
987 avgexp = (double) total_exp / monster_cnt; 986 avgexp = (double) total_exp / monster_cnt;
988 987
… …
1001 * postive values make it darker, negative make it brighter 1000 * postive values make it darker, negative make it brighter
1002 */ 1001 */
1003int 1002int
1004maptile::change_map_light (int change) 1003maptile::change_map_light (int change)
1005{ 1004{
1006 int new_level = darkness + change;
1007
1008 /* Nothing to do */ 1005 /* Nothing to do */
1009 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1006 if (!change)
1010 return 0; 1007 return 0;
1011 1008
1012 /* inform all players on the map */ 1009 /* inform all players on the map */
1013 if (change > 0) 1010 if (change > 0)
1014 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1015 else 1012 else
1016 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1013 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1017 1014
1018 /* Do extra checking. since darkness is a unsigned value, 1015 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1019 * we need to be extra careful about negative values.
1020 * In general, the checks below are only needed if change
1021 * is not +/-1
1022 */
1023 if (new_level < 0)
1024 darkness = 0;
1025 else if (new_level >= MAX_DARKNESS)
1026 darkness = MAX_DARKNESS;
1027 else
1028 darkness = new_level;
1029 1016
1030 /* All clients need to get re-updated for the change */ 1017 /* All clients need to get re-updated for the change */
1031 update_all_map_los (this); 1018 update_all_map_los (this);
1019
1032 return 1; 1020 return 1;
1033} 1021}
1034 1022
1035/* 1023/*
1036 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
1037 * on the map (what it looks like, whether it blocks magic, 1025 * on the map (what it looks like, whether it blocks magic,
1038 * has a living creatures, prevents people from passing 1026 * has a living creatures, prevents people from passing
1039 * through, etc) 1027 * through, etc)
1040 */ 1028 */
1041void 1029void
1042mapspace::update_ () 1030mapspace::update_ ()
1043{ 1031{
1044 object *tmp, *last = 0; 1032 object *last = 0;
1045 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1034 sint8 light = 0;
1046 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0;
1037 uint32_t items = 0;
1038 object *anywhere = 0;
1039 uint8_t middle_visibility = 0;
1047 1040
1048 //object *middle = 0; 1041 //object *middle = 0;
1049 //object *top = 0; 1042 //object *top = 0;
1050 //object *floor = 0; 1043 //object *floor = 0;
1051 // this seems to generate better code than using locals, above 1044 // this seems to generate better code than using locals, above
1052 object *&top = faces_obj[0] = 0; 1045 object *&top = faces_obj[0] = 0;
1053 object *&middle = faces_obj[1] = 0; 1046 object *&middle = faces_obj[1] = 0;
1054 object *&floor = faces_obj[2] = 0; 1047 object *&floor = faces_obj[2] = 0;
1055 1048
1049 object::flags_t allflags; // all flags of all objects or'ed together
1050
1056 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1051 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1057 { 1052 {
1058 /* This could be made additive I guess (two lights better than 1053 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1059 * one). But if so, it shouldn't be a simple additive - 2
1060 * light bulbs do not illuminate twice as far as once since
1061 * it is a dissapation factor that is cubed.
1062 */
1063 if (tmp->glow_radius > light)
1064 light = tmp->glow_radius; 1054 light += tmp->glow_radius;
1065 1055
1066 /* This call is needed in order to update objects the player 1056 /* This call is needed in order to update objects the player
1067 * is standing in that have animations (ie, grass, fire, etc). 1057 * is standing in that have animations (ie, grass, fire, etc).
1068 * However, it also causes the look window to be re-drawn 1058 * However, it also causes the look window to be re-drawn
1069 * 3 times each time the player moves, because many of the 1059 * 3 times each time the player moves, because many of the
1070 * functions the move_player calls eventualy call this. 1060 * functions the move_player calls eventualy call this.
1071 * 1061 *
1072 * Always put the player down for drawing. 1062 * Always put the player down for drawing.
1073 */ 1063 */
1074 if (!tmp->invisible) 1064 if (ecb_expect_true (!tmp->invisible))
1075 { 1065 {
1076 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1066 if (ecb_expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1077 top = tmp; 1067 top = tmp;
1078 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1068 else if (ecb_expect_false (tmp->flag [FLAG_IS_FLOOR]))
1079 { 1069 {
1080 /* If we got a floor, that means middle and top were below it, 1070 /* If we got a floor, that means middle and top were below it,
1081 * so should not be visible, so we clear them. 1071 * so should not be visible, so we clear them.
1082 */ 1072 */
1083 middle = 0; 1073 middle = 0;
1084 top = 0; 1074 top = 0;
1085 floor = tmp; 1075 floor = tmp;
1076 volume = 0;
1077 items = 0;
1086 } 1078 }
1087 /* Flag anywhere have high priority */ 1079 else
1088 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1089 { 1080 {
1081 if (ecb_expect_true (!tmp->flag [FLAG_NO_PICK]))
1082 {
1083 ++items;
1084 volume += tmp->volume ();
1085 }
1086
1087 /* Flag anywhere have high priority */
1088 if (ecb_expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1089 anywhere = tmp;
1090
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 if (ecb_expect_false (::faces [tmp->face].visibility >= middle_visibility))
1096 {
1097 middle_visibility = ::faces [tmp->face].visibility;
1090 middle = tmp; 1098 middle = tmp;
1091 anywhere = 1; 1099 }
1092 } 1100 }
1093 /* Find the highest visible face around. If equal
1094 * visibilities, we still want the one nearer to the
1095 * top
1096 */
1097 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1098 middle = tmp;
1099 }
1100
1101 if (tmp == tmp->above)
1102 {
1103 LOG (llevError, "Error in structure of map\n");
1104 exit (-1);
1105 } 1101 }
1106 1102
1107 move_slow |= tmp->move_slow; 1103 move_slow |= tmp->move_slow;
1108 move_block |= tmp->move_block; 1104 move_block |= tmp->move_block;
1109 move_on |= tmp->move_on; 1105 move_on |= tmp->move_on;
1110 move_off |= tmp->move_off; 1106 move_off |= tmp->move_off;
1111 move_allow |= tmp->move_allow; 1107 move_allow |= tmp->move_allow;
1112 1108
1113 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1109 allflags |= tmp->flag;
1114 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1110
1115 if (tmp->type == PLAYER) flags |= P_PLAYER; 1111 if (tmp->type == PLAYER) flags |= P_PLAYER;
1116 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1112 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1117 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1118 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1119 } 1113 }
1120 1114
1121 this->light = light; 1115 // FLAG_SEE_ANYWHERE takes precedence
1116 if (anywhere)
1117 middle = anywhere;
1118
1119 // ORing all flags together and checking them here is much faster
1120 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1121 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1122 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1123 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1124
1125 this->light = min (light, MAX_LIGHT_RADIUS);
1122 this->flags_ = flags; 1126 this->flags_ = flags;
1123 this->move_block = move_block & ~move_allow; 1127 this->move_block = move_block & ~move_allow;
1124 this->move_on = move_on; 1128 this->move_on = move_on;
1125 this->move_off = move_off; 1129 this->move_off = move_off;
1126 this->move_slow = move_slow; 1130 this->move_slow = move_slow;
1131 this->volume_ = (volume + 1023) / 1024;
1132 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1127 1133
1128 /* At this point, we have a floor face (if there is a floor), 1134 /* At this point, we have a floor face (if there is a floor),
1129 * and the floor is set - we are not going to touch it at 1135 * and the floor is set - we are not going to touch it at
1130 * this point. 1136 * this point.
1131 * middle contains the highest visibility face. 1137 * middle contains the highest visibility face.
1132 * top contains a player/monster face, if there is one. 1138 * top contains a player/monster face, if there is one.
1133 * 1139 *
1134 * We now need to fill in top.face and/or middle.face. 1140 * We now need to fill in top.face and/or middle.face.
1135 */ 1141 */
1136 1142
1137 /* If the top face also happens to be high visibility, re-do our 1143 /* If the top face also happens to be high visibility, re-do our
1138 * middle face. This should not happen, as we already have the 1144 * middle face. This should not happen, as we already have the
1139 * else statement above so middle should not get set. OTOH, it 1145 * else statement above so middle should not get set. OTOH, it
1140 * may be possible for the faces to match but be different objects. 1146 * may be possible for the faces to match but be different objects.
1141 */ 1147 */
1142 if (top == middle) 1148 if (top == middle)
1143 middle = 0; 1149 middle = 0;
1144 1150
… …
1146 * 1) top face is set, need middle to be set. 1152 * 1) top face is set, need middle to be set.
1147 * 2) middle is set, need to set top. 1153 * 2) middle is set, need to set top.
1148 * 3) neither middle or top is set - need to set both. 1154 * 3) neither middle or top is set - need to set both.
1149 */ 1155 */
1150 1156
1151 for (tmp = last; tmp; tmp = tmp->below) 1157 for (object *tmp = last; tmp; tmp = tmp->below)
1152 { 1158 {
1153 /* Once we get to a floor, stop, since we already have a floor object */ 1159 /* Once we get to a floor, stop, since we already have a floor object */
1154 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1160 if (tmp->flag [FLAG_IS_FLOOR])
1155 break; 1161 break;
1156 1162
1157 /* If two top faces are already set, quit processing */ 1163 /* If two top faces are already set, quit processing */
1158 if (top && middle) 1164 if (top && middle)
1159 break; 1165 break;
… …
1173 /* top is already set - we should only get here if 1179 /* top is already set - we should only get here if
1174 * middle is not set 1180 * middle is not set
1175 * 1181 *
1176 * Set the middle face and break out, since there is nothing 1182 * Set the middle face and break out, since there is nothing
1177 * more to fill in. We don't check visiblity here, since 1183 * more to fill in. We don't check visiblity here, since
1178 * 1184 *
1179 */ 1185 */
1180 if (tmp != top) 1186 if (tmp != top)
1181 { 1187 {
1182 middle = tmp; 1188 middle = tmp;
1183 break; 1189 break;
… …
1190 middle = 0; 1196 middle = 0;
1191 1197
1192 if (top == middle) 1198 if (top == middle)
1193 middle = 0; 1199 middle = 0;
1194 1200
1201 // set lower map transparent floor flag if applicable
1202 if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
1203 {
1204 floor->set_anim_frame (0);
1205
1206 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1207 {
1208 mapspace &ms = m->at (floor->x, floor->y);
1209 ms.update ();
1210
1211 if (object *floor2 = ms.faces_obj [2])
1212 if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
1213 {
1214 floor->set_anim_frame (1);
1215 top = floor;
1216 middle = ms.faces_obj [0];
1217 floor = floor2;
1218 }
1219
1220 ms.pflags |= PF_VIS_UP;
1221 }
1222 }
1223
1195#if 0 1224#if 0
1196 faces_obj [0] = top; 1225 faces_obj [0] = top;
1197 faces_obj [1] = middle; 1226 faces_obj [1] = middle;
1198 faces_obj [2] = floor; 1227 faces_obj [2] = floor;
1199#endif 1228#endif
1200} 1229}
1201 1230
1202uint64 1231void
1203mapspace::volume () const 1232mapspace::update_up ()
1204{ 1233{
1205 uint64 vol = 0; 1234 // invalidate up
1206 1235 if (!(pflags & PF_VIS_UP))
1207 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1208 vol += op->volume ();
1209
1210 return vol; 1236 return;
1211}
1212 1237
1213/* this updates the orig_map->tile_map[tile_num] value after finding 1238 pflags &= ~PF_VIS_UP;
1214 * the map. It also takes care of linking back the freshly found
1215 * maps tile_map values if it tiles back to this one. It returns
1216 * the value of orig_map->tile_map[tile_num].
1217 */
1218static inline maptile *
1219find_and_link (maptile *orig_map, int tile_num)
1220{
1221 maptile *mp = orig_map->tile_map [tile_num];
1222 1239
1223 if (!mp) 1240 if (bot)
1224 { 1241 if (maptile *m = bot->map->tile_map [TILE_UP])
1225 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map); 1242 m->at (bot->x, bot->y).invalidate ();
1243}
1226 1244
1227 if (!mp) 1245maptile *
1246maptile::tile_available (int dir, bool load)
1247{
1248 // map is there and we don't need to load it OR it's loaded => return what we have
1249 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1250 return tile_map [dir];
1251
1252 if (tile_path [dir])
1253 {
1254 // well, try to locate it then, if possible - maybe it's there already
1255 // this is the ONLY place in the server that links maps with each other,
1256 // so any kind of inter-map stuff has to be initiated here.
1257 if (maptile *m = find_async (tile_path [dir], this, load))
1228 { 1258 {
1229 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1259 bool mismatch = false;
1230 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1260
1231 &orig_map->tile_path[tile_num], &orig_map->path); 1261 if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
1232 mp = new maptile (1, 1); 1262 if (width != m->width)
1233 mp->alloc (); 1263 mismatch = true;
1234 mp->in_memory = MAP_IN_MEMORY; 1264
1265 if (dir == TILE_EAST || dir == TILE_WEST || dir == TILE_UP || dir == TILE_DOWN)
1266 if (height != m->height)
1267 mismatch = true;
1268
1269 if (mismatch)
1270 {
1271 LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
1272 dir, &path, &m->path);
1273 m = 0;
1274 }
1275 else if (0)//D
1276 {
1277 // as an optimisation, link us against the other map if the other map
1278 // has us as neighbour, which is very common, but not guaranteed.
1279 int dir2 = REVERSE_TILE_DIR (dir);
1280
1281 if (m->tile_path [dir2] == path)
1282 m->tile_map [dir2] = this;
1283 }
1284
1285
1286 return tile_map [dir] = m;
1235 } 1287 }
1236 } 1288 }
1237 1289
1238 int dest_tile = (tile_num + 2) % 4;
1239
1240 orig_map->tile_map [tile_num] = mp;
1241
1242 // optimisation: back-link map to origin map if euclidean
1243 //TODO: non-euclidean maps MUST GO
1244 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1245 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1246
1247 return mp; 1290 return 0;
1248}
1249
1250static inline void
1251load_and_link (maptile *orig_map, int tile_num)
1252{
1253 find_and_link (orig_map, tile_num)->load_sync ();
1254} 1291}
1255 1292
1256/* this returns TRUE if the coordinates (x,y) are out of 1293/* this returns TRUE if the coordinates (x,y) are out of
1257 * map m. This function also takes into account any 1294 * map m. This function also takes into account any
1258 * tiling considerations, loading adjacant maps as needed. 1295 * tiling considerations, loading adjacant maps as needed.
1259 * This is the function should always be used when it 1296 * This is the function should always be used when it
1260 * necessary to check for valid coordinates. 1297 * necessary to check for valid coordinates.
1261 * This function will recursively call itself for the 1298 * This function will recursively call itself for the
1262 * tiled maps. 1299 * tiled maps.
1263 */ 1300 */
1264int 1301int
1265out_of_map (maptile *m, int x, int y) 1302out_of_map (maptile *m, int x, int y)
1266{ 1303{
… …
1271 if (!m) 1308 if (!m)
1272 return 0; 1309 return 0;
1273 1310
1274 if (x < 0) 1311 if (x < 0)
1275 { 1312 {
1276 if (!m->tile_path[3]) 1313 if (!m->tile_available (TILE_WEST))
1277 return 1; 1314 return 1;
1278 1315
1279 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1280 find_and_link (m, 3);
1281
1282 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1316 return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1283 } 1317 }
1284 1318
1285 if (x >= m->width) 1319 if (x >= m->width)
1286 { 1320 {
1287 if (!m->tile_path[1]) 1321 if (!m->tile_available (TILE_EAST))
1288 return 1; 1322 return 1;
1289 1323
1290 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1291 find_and_link (m, 1);
1292
1293 return out_of_map (m->tile_map[1], x - m->width, y); 1324 return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1294 } 1325 }
1295 1326
1296 if (y < 0) 1327 if (y < 0)
1297 { 1328 {
1298 if (!m->tile_path[0]) 1329 if (!m->tile_available (TILE_NORTH))
1299 return 1; 1330 return 1;
1300 1331
1301 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1302 find_and_link (m, 0);
1303
1304 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1332 return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1305 } 1333 }
1306 1334
1307 if (y >= m->height) 1335 if (y >= m->height)
1308 { 1336 {
1309 if (!m->tile_path[2]) 1337 if (!m->tile_available (TILE_SOUTH))
1310 return 1; 1338 return 1;
1311 1339
1312 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1313 find_and_link (m, 2);
1314
1315 return out_of_map (m->tile_map[2], x, y - m->height); 1340 return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1316 } 1341 }
1317 1342
1318 /* Simple case - coordinates are within this local 1343 /* Simple case - coordinates are within this local
1319 * map. 1344 * map.
1320 */ 1345 */
… …
1322} 1347}
1323 1348
1324/* This is basically the same as out_of_map above, but 1349/* This is basically the same as out_of_map above, but
1325 * instead we return NULL if no map is valid (coordinates 1350 * instead we return NULL if no map is valid (coordinates
1326 * out of bounds and no tiled map), otherwise it returns 1351 * out of bounds and no tiled map), otherwise it returns
1327 * the map as that the coordinates are really on, and 1352 * the map as that the coordinates are really on, and
1328 * updates x and y to be the localised coordinates. 1353 * updates x and y to be the localised coordinates.
1329 * Using this is more efficient of calling out_of_map 1354 * Using this is more efficient of calling out_of_map
1330 * and then figuring out what the real map is 1355 * and then figuring out what the real map is
1331 */ 1356 */
1332maptile * 1357maptile *
1333maptile::xy_find (sint16 &x, sint16 &y) 1358maptile::xy_find (sint16 &x, sint16 &y)
1334{ 1359{
1335 if (x < 0) 1360 if (x < 0)
1336 { 1361 {
1337 if (!tile_path[3]) 1362 if (!tile_available (TILE_WEST))
1338 return 0; 1363 return 0;
1339 1364
1340 find_and_link (this, 3);
1341 x += tile_map[3]->width; 1365 x += tile_map [TILE_WEST]->width;
1342 return tile_map[3]->xy_find (x, y); 1366 return tile_map [TILE_WEST]->xy_find (x, y);
1343 } 1367 }
1344 1368
1345 if (x >= width) 1369 if (x >= width)
1346 { 1370 {
1347 if (!tile_path[1]) 1371 if (!tile_available (TILE_EAST))
1348 return 0; 1372 return 0;
1349 1373
1350 find_and_link (this, 1);
1351 x -= width; 1374 x -= width;
1352 return tile_map[1]->xy_find (x, y); 1375 return tile_map [TILE_EAST]->xy_find (x, y);
1353 } 1376 }
1354 1377
1355 if (y < 0) 1378 if (y < 0)
1356 { 1379 {
1357 if (!tile_path[0]) 1380 if (!tile_available (TILE_NORTH))
1358 return 0; 1381 return 0;
1359 1382
1360 find_and_link (this, 0);
1361 y += tile_map[0]->height; 1383 y += tile_map [TILE_NORTH]->height;
1362 return tile_map[0]->xy_find (x, y); 1384 return tile_map [TILE_NORTH]->xy_find (x, y);
1363 } 1385 }
1364 1386
1365 if (y >= height) 1387 if (y >= height)
1366 { 1388 {
1367 if (!tile_path[2]) 1389 if (!tile_available (TILE_SOUTH))
1368 return 0; 1390 return 0;
1369 1391
1370 find_and_link (this, 2);
1371 y -= height; 1392 y -= height;
1372 return tile_map[2]->xy_find (x, y); 1393 return tile_map [TILE_SOUTH]->xy_find (x, y);
1373 } 1394 }
1374 1395
1375 /* Simple case - coordinates are within this local 1396 /* Simple case - coordinates are within this local
1376 * map. 1397 * map.
1377 */ 1398 */
… …
1381/** 1402/**
1382 * Return whether map2 is adjacent to map1. If so, store the distance from 1403 * Return whether map2 is adjacent to map1. If so, store the distance from
1383 * map1 to map2 in dx/dy. 1404 * map1 to map2 in dx/dy.
1384 */ 1405 */
1385int 1406int
1386adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1407adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1387{ 1408{
1388 if (!map1 || !map2) 1409 if (!map1 || !map2)
1389 return 0; 1410 return 0;
1390 1411
1391 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1412 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1392 //fix: compare paths instead (this is likely faster, too!) 1413 //fix: compare paths instead (this is likely faster, too!)
1393 if (map1 == map2) 1414 if (map1 == map2)
1394 { 1415 {
1395 *dx = 0; 1416 *dx = 0;
1396 *dy = 0; 1417 *dy = 0;
1397 } 1418 }
1398 else if (map1->tile_map[0] == map2) 1419 else if (map1->tile_available (TILE_NORTH, false) == map2)
1399 { /* up */ 1420 {
1400 *dx = 0; 1421 *dx = 0;
1401 *dy = -map2->height; 1422 *dy = -map2->height;
1402 } 1423 }
1403 else if (map1->tile_map[1] == map2) 1424 else if (map1->tile_available (TILE_EAST , false) == map2)
1404 { /* right */ 1425 {
1405 *dx = map1->width; 1426 *dx = map1->width;
1406 *dy = 0; 1427 *dy = 0;
1407 } 1428 }
1408 else if (map1->tile_map[2] == map2) 1429 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1409 { /* down */ 1430 {
1410 *dx = 0; 1431 *dx = 0;
1411 *dy = map1->height; 1432 *dy = map1->height;
1412 } 1433 }
1413 else if (map1->tile_map[3] == map2) 1434 else if (map1->tile_available (TILE_WEST , false) == map2)
1414 { /* left */ 1435 {
1415 *dx = -map2->width; 1436 *dx = -map2->width;
1416 *dy = 0; 1437 *dy = 0;
1417 } 1438 }
1418 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1439 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1419 { /* up right */ 1440 { /* up right */
1420 *dx = map1->tile_map[0]->width; 1441 *dx = +map1->tile_map[TILE_NORTH]->width;
1421 *dy = -map1->tile_map[0]->height; 1442 *dy = -map1->tile_map[TILE_NORTH]->height;
1422 } 1443 }
1423 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1444 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1424 { /* up left */ 1445 { /* up left */
1425 *dx = -map2->width; 1446 *dx = -map2->width;
1426 *dy = -map1->tile_map[0]->height; 1447 *dy = -map1->tile_map[TILE_NORTH]->height;
1427 } 1448 }
1428 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1449 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1429 { /* right up */ 1450 { /* right up */
1430 *dx = map1->width; 1451 *dx = +map1->width;
1431 *dy = -map2->height; 1452 *dy = -map2->height;
1432 } 1453 }
1433 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1454 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1434 { /* right down */ 1455 { /* right down */
1435 *dx = map1->width; 1456 *dx = +map1->width;
1436 *dy = map1->tile_map[1]->height; 1457 *dy = +map1->tile_map[TILE_EAST]->height;
1437 } 1458 }
1438 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1459 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1439 { /* down right */ 1460 { /* down right */
1440 *dx = map1->tile_map[2]->width; 1461 *dx = +map1->tile_map[TILE_SOUTH]->width;
1441 *dy = map1->height; 1462 *dy = +map1->height;
1442 } 1463 }
1443 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1464 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1444 { /* down left */ 1465 { /* down left */
1445 *dx = -map2->width; 1466 *dx = -map2->width;
1446 *dy = map1->height; 1467 *dy = +map1->height;
1447 } 1468 }
1448 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1469 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1449 { /* left up */ 1470 { /* left up */
1450 *dx = -map1->tile_map[3]->width; 1471 *dx = -map1->tile_map[TILE_WEST]->width;
1451 *dy = -map2->height; 1472 *dy = -map2->height;
1452 } 1473 }
1453 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1474 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1454 { /* left down */ 1475 { /* left down */
1455 *dx = -map1->tile_map[3]->width; 1476 *dx = -map1->tile_map[TILE_WEST]->width;
1456 *dy = map1->tile_map[3]->height; 1477 *dy = +map1->tile_map[TILE_WEST]->height;
1457 } 1478 }
1458 else 1479 else
1459 return 0; 1480 return 0;
1460 1481
1461 return 1; 1482 return 1;
… …
1484 * so you just can not look the the map coordinates and get the 1505 * so you just can not look the the map coordinates and get the
1485 * righte value. distance_x/y are distance away, which 1506 * righte value. distance_x/y are distance away, which
1486 * can be negative. direction is the crossfire direction scheme 1507 * can be negative. direction is the crossfire direction scheme
1487 * that the creature should head. part is the part of the 1508 * that the creature should head. part is the part of the
1488 * monster that is closest. 1509 * monster that is closest.
1489 * 1510 *
1490 * get_rangevector looks at op1 and op2, and fills in the 1511 * get_rangevector looks at op1 and op2, and fills in the
1491 * structure for op1 to get to op2. 1512 * structure for op1 to get to op2.
1492 * We already trust that the caller has verified that the 1513 * We already trust that the caller has verified that the
1493 * two objects are at least on adjacent maps. If not, 1514 * two objects are at least on adjacent maps. If not,
1494 * results are not likely to be what is desired. 1515 * results are not likely to be what is desired.
… …
1497 * 1518 *
1498 * currently, the only flag supported (0x1) is don't translate for 1519 * currently, the only flag supported (0x1) is don't translate for
1499 * closest body part of 'op1' 1520 * closest body part of 'op1'
1500 */ 1521 */
1501void 1522void
1502get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1523get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1503{ 1524{
1504 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1525 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1505 { 1526 {
1506 /* be conservative and fill in _some_ data */ 1527 /* be conservative and fill in _some_ data */
1507 retval->distance = 10000; 1528 retval->distance = 10000;
1508 retval->distance_x = 10000; 1529 retval->distance_x = 10000;
1509 retval->distance_y = 10000; 1530 retval->distance_y = 10000;
1510 retval->direction = 0; 1531 retval->direction = 0;
1511 retval->part = 0; 1532 retval->part = 0;
1512 } 1533 }
1513 else 1534 else
1514 { 1535 {
1515 object *best;
1516
1517 retval->distance_x += op2->x - op1->x; 1536 retval->distance_x += op2->x - op1->x;
1518 retval->distance_y += op2->y - op1->y; 1537 retval->distance_y += op2->y - op1->y;
1519 1538
1520 best = op1; 1539 object *best = op1;
1540
1521 /* If this is multipart, find the closest part now */ 1541 /* If this is multipart, find the closest part now */
1522 if (!(flags & 0x1) && op1->more) 1542 if (!(flags & 1) && op1->more)
1523 { 1543 {
1524 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1544 int best_distance = idistance (retval->distance_x, retval->distance_y);
1525 1545
1526 /* we just take the offset of the piece to head to figure 1546 /* we just take the offset of the piece to head to figure
1527 * distance instead of doing all that work above again 1547 * distance instead of doing all that work above again
1528 * since the distance fields we set above are positive in the 1548 * since the distance fields we set above are positive in the
1529 * same axis as is used for multipart objects, the simply arithmetic 1549 * same axis as is used for multipart objects, the simply arithmetic
1530 * below works. 1550 * below works.
1531 */ 1551 */
1532 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1552 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1533 { 1553 {
1534 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1554 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1535 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1555
1536 if (tmpi < best_distance) 1556 if (tmpi < best_distance)
1537 { 1557 {
1538 best_distance = tmpi; 1558 best_distance = tmpi;
1539 best = tmp; 1559 best = tmp;
1540 } 1560 }
1541 } 1561 }
1542 1562
1543 if (best != op1) 1563 if (best != op1)
1544 { 1564 {
1545 retval->distance_x += op1->x - best->x; 1565 retval->distance_x += op1->x - best->x;
1546 retval->distance_y += op1->y - best->y; 1566 retval->distance_y += op1->y - best->y;
1547 } 1567 }
1548 } 1568 }
1549 1569
1550 retval->part = best; 1570 retval->part = best;
1551 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1571 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1552 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1572 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1553 } 1573 }
1554} 1574}
1555 1575
1556/* this is basically the same as get_rangevector above, but instead of 1576/* this is basically the same as get_rangevector above, but instead of
1557 * the first parameter being an object, it instead is the map 1577 * the first parameter being an object, it instead is the map
1558 * and x,y coordinates - this is used for path to player - 1578 * and x,y coordinates - this is used for path to player -
1559 * since the object is not infact moving but we are trying to traverse 1579 * since the object is not infact moving but we are trying to traverse
1560 * the path, we need this. 1580 * the path, we need this.
1561 * flags has no meaning for this function at this time - I kept it in to 1581 * flags has no meaning for this function at this time - I kept it in to
1562 * be more consistant with the above function and also in case they are needed 1582 * be more consistant with the above function and also in case they are needed
1563 * for something in the future. Also, since no object is pasted, the best 1583 * for something in the future. Also, since no object is pasted, the best
1564 * field of the rv_vector is set to NULL. 1584 * field of the rv_vector is set to NULL.
1565 */ 1585 */
1566void 1586void
1567get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1587get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1568{ 1588{
1569 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1589 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1570 { 1590 {
1571 /* be conservative and fill in _some_ data */ 1591 /* be conservative and fill in _some_ data */
1572 retval->distance = 100000; 1592 retval->distance = 100000;
1573 retval->distance_x = 32767; 1593 retval->distance_x = 32767;
1574 retval->distance_y = 32767; 1594 retval->distance_y = 32767;
1575 retval->direction = 0; 1595 retval->direction = 0;
1576 retval->part = 0; 1596 retval->part = 0;
1577 } 1597 }
1578 else 1598 else
1579 { 1599 {
1580 retval->distance_x += op2->x - x; 1600 retval->distance_x += op2->x - x;
1581 retval->distance_y += op2->y - y; 1601 retval->distance_y += op2->y - y;
1582 1602
1583 retval->part = NULL; 1603 retval->part = 0;
1584 retval->distance = idistance (retval->distance_x, retval->distance_y); 1604 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1585 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1605 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1586 } 1606 }
1587} 1607}
1588 1608
1589/* Returns true of op1 and op2 are effectively on the same map 1609/* Returns true of op1 and op2 are effectively on the same map
1590 * (as related to map tiling). Note that this looks for a path from 1610 * (as related to map tiling). Note that this looks for a path from
… …
1600 int dx, dy; 1620 int dx, dy;
1601 1621
1602 return adjacent_map (op1->map, op2->map, &dx, &dy); 1622 return adjacent_map (op1->map, op2->map, &dx, &dy);
1603} 1623}
1604 1624
1625//-GPL
1626
1605object * 1627object *
1606maptile::insert (object *op, int x, int y, object *originator, int flags) 1628maptile::insert (object *op, int x, int y, object *originator, int flags)
1607{ 1629{
1608 if (!op->flag [FLAG_REMOVED])
1609 op->remove ();
1610
1611 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1630 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1612} 1631}
1613 1632
1614region * 1633region *
1615maptile::region (int x, int y) const 1634maptile::region (int x, int y) const
… …
1624 return default_region; 1643 return default_region;
1625 1644
1626 return ::region::default_region (); 1645 return ::region::default_region ();
1627} 1646}
1628 1647
1648//+GPL
1649
1629/* picks a random object from a style map. 1650/* picks a random object from a style map.
1630 * Redone by MSW so it should be faster and not use static
1631 * variables to generate tables.
1632 */ 1651 */
1633object * 1652object *
1634maptile::pick_random_object () const 1653maptile::pick_random_object (rand_gen &gen) const
1635{ 1654{
1636 /* while returning a null object will result in a crash, that 1655 /* while returning a null object will result in a crash, that
1637 * is actually preferable to an infinite loop. That is because 1656 * is actually preferable to an infinite loop. That is because
1638 * most servers will automatically restart in case of crash. 1657 * most servers will automatically restart in case of crash.
1639 * Change the logic on getting the random space - shouldn't make 1658 * Change the logic on getting the random space - shouldn't make
1640 * any difference, but this seems clearer to me. 1659 * any difference, but this seems clearer to me.
1641 */ 1660 */
1642 for (int i = 1000; --i;) 1661 for (int i = 1000; --i;)
1643 { 1662 {
1644 object *pick = at (rndm (width), rndm (height)).bot; 1663 object *pick = at (gen (width), gen (height)).bot;
1645 1664
1646 // do not prefer big monsters just because they are big. 1665 // must be head: do not prefer big monsters just because they are big.
1647 if (pick && pick->head_ () == pick) 1666 if (pick && pick->is_head ())
1648 return pick->head_ (); 1667 return pick;
1649 } 1668 }
1650 1669
1651 // instead of crashing in the unlikely(?) case, try to return *something* 1670 // instead of crashing in the unlikely(?) case, try to return *something*
1652 return get_archetype ("blocked"); 1671 return archetype::find (shstr_bug);
1653} 1672}
1654 1673
1674//-GPL
1675
1676void
1677maptile::play_sound (faceidx sound, int x, int y) const
1678{
1679 if (!sound)
1680 return;
1681
1682 for_all_players_on_map (pl, this)
1683 if (client *ns = pl->ns)
1684 {
1685 int dx = x - pl->ob->x;
1686 int dy = y - pl->ob->y;
1687
1688 int distance = idistance (dx, dy);
1689
1690 if (distance <= MAX_SOUND_DISTANCE)
1691 ns->play_sound (sound, dx, dy);
1692 }
1693}
1694
1695void
1696maptile::say_msg (const char *msg, int x, int y) const
1697{
1698 for_all_players (pl)
1699 if (client *ns = pl->ns)
1700 {
1701 int dx = x - pl->ob->x;
1702 int dy = y - pl->ob->y;
1703
1704 int distance = idistance (dx, dy);
1705
1706 if (distance <= MAX_SOUND_DISTANCE)
1707 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1708 }
1709}
1710
1711dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1712
1713static void
1714split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1715{
1716 // clip to map to the left
1717 if (x0 < 0)
1718 {
1719 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1720 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1721
1722 if (x1 < 0) // entirely to the left
1723 return;
1724
1725 x0 = 0;
1726 }
1727
1728 // clip to map to the right
1729 if (x1 > m->width)
1730 {
1731 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1732 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1733
1734 if (x0 >= m->width) // entirely to the right
1735 return;
1736
1737 x1 = m->width;
1738 }
1739
1740 // clip to map to the north
1741 if (y0 < 0)
1742 {
1743 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1744 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1745
1746 if (y1 < 0) // entirely to the north
1747 return;
1748
1749 y0 = 0;
1750 }
1751
1752 // clip to map to the south
1753 if (y1 > m->height)
1754 {
1755 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1756 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1757
1758 if (y0 >= m->height) // entirely to the south
1759 return;
1760
1761 y1 = m->height;
1762 }
1763
1764 // if we get here, the rect is within the current map
1765 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1766
1767 r->m = m;
1768 r->x0 = x0;
1769 r->y0 = y0;
1770 r->x1 = x1;
1771 r->y1 = y1;
1772 r->dx = dx;
1773 r->dy = dy;
1774}
1775
1776maprect *
1777maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1778{
1779 buf.clear ();
1780
1781 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1782
1783 // add end marker
1784 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1785 r->m = 0;
1786
1787 return (maprect *)buf.linearise ();
1788}
1789

Diff Legend

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