ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.122 by root, Wed Jan 24 22:42:48 2007 UTC vs.
Revision 1.302 by root, Tue Nov 10 00:01:31 2009 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 (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 25#include <global.h>
29#include <stdio.h> 26#include <stdio.h>
30#include <sys/types.h> 27#include <sys/types.h>
31#include <sys/uio.h> 28#include <sys/uio.h>
32#include <object.h> 29#include <object.h>
33#include <funcpoint.h> 30#include <sproto.h>
34#include <loader.h> 31#include <loader.h>
35 32
36#include <bitset> 33#include <bitset>
37 34
38int nrofallocobjects = 0; 35UUID UUID::cur;
39static UUID uuid; 36static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000;
41 39
42objectvec objects; 40objectvec objects;
43activevec actives; 41activevec actives;
44 42
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43//+GPL
44
45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 56};
54int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 58 0,
59 1, 2, 3, 4, 5, 6, 7, 8,
60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 62};
58 63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
69};
70
59static void 71static void
60write_uuid (void) 72write_uuid (uval64 skip, bool sync)
61{ 73{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 74 CALL_BEGIN (2);
63 75 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 76 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 78 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 79}
79 80
80static void 81static void
81read_uuid (void) 82read_uuid (void)
82{ 83{
83 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
84 85
85 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
87
88 seq_next_save = 0;
86 89
87 FILE *fp; 90 FILE *fp;
88 91
89 if (!(fp = fopen (filename, "r"))) 92 if (!(fp = fopen (filename, "r")))
90 { 93 {
91 if (errno == ENOENT) 94 if (errno == ENOENT)
92 { 95 {
93 LOG (llevInfo, "RESET uid to 1\n"); 96 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 97 UUID::cur.seq = 0;
95 write_uuid (); 98 write_uuid (UUID_GAP, true);
96 return; 99 return;
97 } 100 }
98 101
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 103 _exit (1);
101 } 104 }
102 105
103 int version; 106 char buf [UUID::MAX_LEN];
104 unsigned long long uid; 107 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 108 fgets (buf, sizeof (buf), fp);
109
110 if (!UUID::cur.parse (buf))
106 { 111 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 112 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 113 _exit (1);
109 } 114 }
110 115
111 uuid.seq = uid; 116 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 117
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 118 write_uuid (UUID_GAP, true);
114 fclose (fp); 119 fclose (fp);
115} 120}
116 121
117UUID 122UUID
118gen_uuid () 123UUID::gen ()
119{ 124{
120 UUID uid; 125 UUID uid;
121 126
122 uid.seq = ++uuid.seq; 127 uid.seq = ++cur.seq;
123 128
124 if (!(uuid.seq & (UUID_SKIP - 1))) 129 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 130 {
131 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
132 write_uuid (UUID_GAP, false);
133 }
134
126 135
127 return uid; 136 return uid;
128} 137}
129 138
130void 139void
131init_uuid () 140UUID::init ()
132{ 141{
133 read_uuid (); 142 read_uuid ();
134} 143}
135 144
145bool
146UUID::parse (const char *s)
147{
148 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
149 return false;
150
151 seq = 0;
152
153 while (*s != '>')
154 {
155 if (*s < '0')
156 return false;
157
158 // this gives nice branchless code with gcc
159 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
160 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
161
162 seq = (seq << 4) | digit;
163
164 ++s;
165 }
166
167 return true;
168}
169
170char *
171UUID::append (char *buf) const
172{
173 *buf++ = '<';
174 *buf++ = '1';
175 *buf++ = '.';
176
177 uint64_t seq = this->seq;
178 const int bits = 64;
179 char nz = 0;
180 static const char tohex [] = "0123456789abcdef";
181
182 // assert (len >= 3 + bits / 4 + 1 + 1);
183 for (int i = bits / 4; --i; )
184 {
185 uint8_t digit = seq >> (bits - 4);
186
187 *buf = tohex [digit];
188 nz |= digit;
189 buf += nz ? 1 : 0;
190 seq <<= 4;
191 }
192
193 // last digit is special - always emit
194 uint8_t digit = seq >> (bits - 4);
195 *buf++ = tohex [digit];
196
197 *buf++ = '>';
198
199 return buf;
200}
201
202char *
203UUID::c_str () const
204{
205 static char buf [MAX_LEN];
206 *append (buf) = 0;
207 return buf;
208}
209
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 210/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 211static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
139{ 213{
140 key_value *wants_field;
141
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 214 /* n-squared behaviour (see kv_get), but I'm hoping both
143 * objects with lists are rare, and lists stay short. If not, use a 215 * objects with lists are rare, and lists stay short. If not, use a
144 * different structure or at least keep the lists sorted... 216 * different structure or at least keep the lists sorted...
145 */ 217 */
146 218
147 /* For each field in wants, */ 219 /* For each field in wants, */
148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 220 for (key_value *kv = wants->key_values; kv; kv = kv->next)
149 { 221 if (has->kv_get (kv->key) != kv->value)
150 key_value *has_field; 222 return false;
151
152 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key);
154
155 if (has_field == NULL)
156 {
157 /* No field with that name. */
158 return FALSE;
159 }
160
161 /* Found the matching field. */
162 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167
168 /* If we get here, we found a match. Now for the next field in wants. */
169 }
170 223
171 /* If we get here, every field in wants has a matching field in has. */ 224 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 225 return true;
173} 226}
174 227
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 228/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 229static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 230compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 231{
179 /* However, there may be fields in has which aren't partnered in wants, 232 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 233 * so we need to run the comparison *twice*. :(
181 */ 234 */
182 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 235 return compare_ob_value_lists_one (ob1, ob2)
236 && compare_ob_value_lists_one (ob2, ob1);
183} 237}
184 238
185/* Function examines the 2 objects given to it, and returns true if 239/* Function examines the 2 objects given to it, and returns true if
186 * they can be merged together. 240 * they can be merged together.
187 * 241 *
197bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
198{ 252{
199 /* A couple quicksanity checks */ 253 /* A couple quicksanity checks */
200 if (ob1 == ob2 254 if (ob1 == ob2
201 || ob1->type != ob2->type 255 || ob1->type != ob2->type
202 || ob1->speed != ob2->speed 256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
203 || ob1->value != ob2->value 257 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 258 || ob1->name != ob2->name)
205 return 0; 259 return 0;
206 260
207 //TODO: this ain't working well, use nicer and correct overflow check
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 261 /* Do not merge objects if nrof would overflow, assume nrof
209 * value could not be stored in a sint32 (which unfortunately sometimes is 262 * is always 0 .. 2**31-1 */
210 * used to store nrof). 263 if (ob1->nrof > 0x7fffffff - ob2->nrof)
211 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
213 return 0; 264 return 0;
214 265
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 266 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 267 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 268 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 269 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 270 * flags lose any meaning.
220 */ 271 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 272 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 273 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 274
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 275 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 276 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 277
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 278 if (ob1->arch->archname != ob2->arch->archname
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 279 || ob1->name != ob2->name
230 || ob1->title != ob2->title 280 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 281 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 282 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 283 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 284 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 285 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 287 || ob1->value != ob2->value
240 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
241 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
242 || ob1->materialname != ob2->materialname 291 || ob1->materialname != ob2->materialname
243 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
244 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
245 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
246 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 303 return 0;
253 304
305 if ((ob1->flag ^ ob2->flag)
306 .reset (FLAG_INV_LOCKED)
307 .reset (FLAG_REMOVED)
308 .any ())
309 return 0;
310
254 /* This is really a spellbook check - really, we should 311 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 312 * not merge objects with real inventories, as splitting them
313 * is hard.
256 */ 314 */
257 if (ob1->inv || ob2->inv) 315 if (ob1->inv || ob2->inv)
258 { 316 {
259 /* if one object has inventory but the other doesn't, not equiv */ 317 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 318 return 0; /* inventories differ in length */
261 return 0;
262 319
263 /* Now check to see if the two inventory objects could merge */ 320 if (ob1->inv->below || ob2->inv->below)
321 return 0; /* more than one object in inv */
322
264 if (!object::can_merge (ob1->inv, ob2->inv)) 323 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 324 return 0; /* inventory objects differ */
266 325
267 /* inventory ok - still need to check rest of this object to see 326 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 327 * if it is valid.
269 */ 328 */
270 } 329 }
289 if (ob1->level != ob2->level) 348 if (ob1->level != ob2->level)
290 return 0; 349 return 0;
291 break; 350 break;
292 } 351 }
293 352
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 353 if (ob1->key_values || ob2->key_values)
295 { 354 {
296 /* At least one of these has key_values. */ 355 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 356 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 357 return 0; /* One has fields, but the other one doesn't. */
358
359 if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 360 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0;
302 } 361 }
303 362
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 363 if (ob1->self || ob2->self)
306 { 364 {
307 ob1->optimise (); 365 ob1->optimise ();
308 ob2->optimise (); 366 ob2->optimise ();
309 367
310 if (ob1->self || ob2->self) 368 if (ob1->self || ob2->self)
369 {
370 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
371 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
372
373 if (k1 != k2)
311 return 0; 374 return 0;
375
376 if (k1 == 0)
377 return 1;
378
379 if (!cfperl_can_merge (ob1, ob2))
380 return 0;
381 }
312 } 382 }
313 383
314 /* Everything passes, must be OK. */ 384 /* Everything passes, must be OK. */
315 return 1; 385 return 1;
316} 386}
317 387
388// find player who can see this object
389object *
390object::visible_to () const
391{
392 if (client_visible () && !flag [FLAG_REMOVED])
393 {
394 // see if we are in a container of sorts
395 if (env)
396 {
397 // the player inventory itself is always visible
398 if (env->is_player ())
399 return env;
400
401 // else a player could have our env open
402 object *envest = env->outer_env_or_self ();
403
404 // the player itself is always on a map, so we will find him here
405 // even if our inv is in a player.
406 if (envest->is_on_map ())
407 if (object *pl = envest->ms ().player ())
408 if (pl->container_ () == env)
409 return pl;
410 }
411 else
412 {
413 // maybe there is a player standing on the same mapspace
414 // this will catch the case where "this" is a player
415 if (object *pl = ms ().player ())
416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
417 || pl->container_ () == this)
418 return pl;
419 }
420 }
421
422 return 0;
423}
424
425// adjust weight per container type ("of holding")
426static sint32
427weight_adjust_for (object *op, sint32 weight)
428{
429 return op->type == CONTAINER
430 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
431 : weight;
432}
433
318/* 434/*
435 * adjust_weight(object, weight) adds the specified weight to an object,
436 * and also updates how much the environment(s) is/are carrying.
437 */
438static void
439adjust_weight (object *op, sint32 weight)
440{
441 while (op)
442 {
443 // adjust by actual difference to account for rounding errors
444 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
445 weight = weight_adjust_for (op, op->carrying)
446 - weight_adjust_for (op, op->carrying - weight);
447
448 if (!weight)
449 return;
450
451 op->carrying += weight;
452
453 if (object *pl = op->visible_to ())
454 if (pl != op) // player is handled lazily
455 esrv_update_item (UPD_WEIGHT, pl, op);
456
457 op = op->env;
458 }
459}
460
461/*
319 * sum_weight() is a recursive function which calculates the weight 462 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 463 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 464 * containers are carrying, and sums it up.
322 */ 465 */
323long 466void
324sum_weight (object *op) 467object::update_weight ()
325{ 468{
326 long sum; 469 sint32 sum = 0;
327 object *inv;
328 470
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 471 for (object *op = inv; op; op = op->below)
330 { 472 {
331 if (inv->inv) 473 if (op->inv)
332 sum_weight (inv); 474 op->update_weight ();
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 475
476 sum += op->total_weight ();
477 }
478
479 sum = weight_adjust_for (this, sum);
480
481 if (sum != carrying)
334 } 482 {
335
336 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100;
338
339 if (op->carrying != sum)
340 op->carrying = sum; 483 carrying = sum;
341 484
342 return sum; 485 if (object *pl = visible_to ())
486 if (pl != this) // player is handled lazily
487 esrv_update_item (UPD_WEIGHT, pl, this);
488 }
343} 489}
344 490
345/** 491/*
346 * Return the outermost environment object for a given object. 492 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
347 */ 493 */
348
349object *
350object_get_env_recursive (object *op)
351{
352 while (op->env != NULL)
353 op = op->env;
354 return op;
355}
356
357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array.
361 */
362
363char * 494char *
364dump_object (object *op) 495dump_object (object *op)
365{ 496{
366 if (!op) 497 if (!op)
367 return strdup ("[NULLOBJ]"); 498 return strdup ("[NULLOBJ]");
368 499
369 object_freezer freezer; 500 object_freezer freezer;
370 save_object (freezer, op, 1); 501 op->write (freezer);
371 return freezer.as_string (); 502 return freezer.as_string ();
372} 503}
373 504
374/* 505char *
375 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned.
378 */
379
380object *
381get_nearest_part (object *op, const object *pl)
382{ 507{
383 object *tmp, *closest; 508 return dump_object (this);
384 int last_dist, i;
385
386 if (op->more == NULL)
387 return op;
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i;
391 return closest;
392} 509}
393 510
394/* 511/*
395 * Returns the object which has the count-variable equal to the argument. 512 * Returns the object which has the count-variable equal to the argument.
513 * VERRRY slow.
396 */ 514 */
397object * 515object *
398find_object (tag_t i) 516find_object (tag_t i)
399{ 517{
400 for_all_objects (op) 518 for_all_objects (op)
411 */ 529 */
412object * 530object *
413find_object_name (const char *str) 531find_object_name (const char *str)
414{ 532{
415 shstr_cmp str_ (str); 533 shstr_cmp str_ (str);
416 object *op;
417 534
535 if (str_)
418 for_all_objects (op) 536 for_all_objects (op)
419 if (op->name == str_) 537 if (op->name == str_)
420 break; 538 return op;
421 539
422 return op; 540 return 0;
423}
424
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429} 541}
430 542
431/* 543/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 544 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 545 * skill and experience objects.
546 * ACTUALLY NO! investigate! TODO
434 */ 547 */
435void 548void
436object::set_owner (object *owner) 549object::set_owner (object *owner)
437{ 550{
551 // allow objects which own objects
438 if (!owner) 552 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 553 while (owner->owner)
449 owner = owner->owner; 554 owner = owner->owner;
555
556 if (flag [FLAG_FREED])
557 {
558 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
559 return;
560 }
450 561
451 this->owner = owner; 562 this->owner = owner;
563}
564
565int
566object::slottype () const
567{
568 if (type == SKILL)
569 {
570 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
571 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
572 }
573 else
574 {
575 if (slot [body_combat].info) return slot_combat;
576 if (slot [body_range ].info) return slot_ranged;
577 }
578
579 return slot_none;
580}
581
582bool
583object::change_weapon (object *ob)
584{
585 if (current_weapon == ob)
586 return true;
587
588 if (chosen_skill)
589 chosen_skill->flag [FLAG_APPLIED] = false;
590
591 current_weapon = ob;
592 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
593
594 if (chosen_skill)
595 chosen_skill->flag [FLAG_APPLIED] = true;
596
597 update_stats ();
598
599 if (ob)
600 {
601 // now check wether any body locations became invalid, in which case
602 // we cannot apply the weapon at the moment.
603 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
604 if (slot[i].used < 0)
605 {
606 current_weapon = chosen_skill = 0;
607 update_stats ();
608
609 new_draw_info_format (NDI_UNIQUE, 0, this,
610 "You try to balance all your items at once, "
611 "but the %s is just too much for your body. "
612 "[You need to unapply some items first - use the 'body' command to see "
613 "how many items you cna wera on a specific body part.]", &ob->name);
614 return false;
615 }
616
617 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
618 }
619 else
620 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
621
622 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
623 {
624 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
625 &name, ob->debug_desc ());
626 return false;
627 }
628
629 return true;
452} 630}
453 631
454/* Zero the key_values on op, decrementing the shared-string 632/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 633 * refcounts and freeing the links.
456 */ 634 */
457static void 635static void
458free_key_values (object *op) 636free_key_values (object *op)
459{ 637{
460 for (key_value *i = op->key_values; i != 0;) 638 for (key_value *i = op->key_values; i; )
461 { 639 {
462 key_value *next = i->next; 640 key_value *next = i->next;
463 delete i; 641 delete i;
464 642
465 i = next; 643 i = next;
477 * will point at garbage. 655 * will point at garbage.
478 */ 656 */
479void 657void
480object::copy_to (object *dst) 658object::copy_to (object *dst)
481{ 659{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 660 dst->remove ();
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485 *(object_copy *)dst = *this; 661 *(object_copy *)dst = *this;
486 662 dst->flag [FLAG_REMOVED] = true;
487 if (is_freed)
488 SET_FLAG (dst, FLAG_FREED);
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 663
496 /* Copy over key_values, if any. */ 664 /* Copy over key_values, if any. */
497 if (key_values) 665 if (key_values)
498 { 666 {
499 key_value *tail = 0; 667 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 668 dst->key_values = 0;
503 669
504 for (i = key_values; i; i = i->next) 670 for (key_value *i = key_values; i; i = i->next)
505 { 671 {
506 key_value *new_link = new key_value; 672 key_value *new_link = new key_value;
507 673
508 new_link->next = 0; 674 new_link->next = 0;
509 new_link->key = i->key; 675 new_link->key = i->key;
510 new_link->value = i->value; 676 new_link->value = i->value;
511 677
512 /* Try and be clever here, too. */ 678 /* Try and be clever here, too. */
513 if (!dst->key_values) 679 if (!dst->key_values)
514 { 680 {
521 tail = new_link; 687 tail = new_link;
522 } 688 }
523 } 689 }
524 } 690 }
525 691
526 dst->set_speed (dst->speed); 692 if (speed < 0)
693 dst->speed_left -= rndm ();
694
695 dst->activate ();
696}
697
698void
699object::instantiate ()
700{
701 if (!uuid.seq) // HACK
702 uuid = UUID::gen ();
703
704 speed_left = -0.1f;
705 /* copy the body_info to the body_used - this is only really
706 * need for monsters, but doesn't hurt to do it for everything.
707 * by doing so, when a monster is created, it has good starting
708 * values for the body_used info, so when items are created
709 * for it, they can be properly equipped.
710 */
711 for (int i = NUM_BODY_LOCATIONS; i--; )
712 slot[i].used = slot[i].info;
713
714 attachable::instantiate ();
527} 715}
528 716
529object * 717object *
530object::clone () 718object::clone ()
531{ 719{
532 object *neu = create (); 720 object *neu = create ();
533 copy_to (neu); 721 copy_to (neu);
722 neu->map = map; // not copied by copy_to
534 return neu; 723 return neu;
535} 724}
536 725
537/* 726/*
538 * If an object with the IS_TURNABLE() flag needs to be turned due 727 * If an object with the IS_TURNABLE() flag needs to be turned due
555 * This function needs to be called whenever the speed of an object changes. 744 * This function needs to be called whenever the speed of an object changes.
556 */ 745 */
557void 746void
558object::set_speed (float speed) 747object::set_speed (float speed)
559{ 748{
560 if (flag [FLAG_FREED] && speed)
561 {
562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
563 speed = 0;
564 }
565
566 this->speed = speed; 749 this->speed = speed;
567 750
568 if (has_active_speed ()) 751 if (has_active_speed ())
569 activate (); 752 activate ();
570 else 753 else
589 * UP_OBJ_FACE: only the objects face has changed. 772 * UP_OBJ_FACE: only the objects face has changed.
590 */ 773 */
591void 774void
592update_object (object *op, int action) 775update_object (object *op, int action)
593{ 776{
594 MoveType move_on, move_off, move_block, move_slow; 777 if (!op)
595
596 if (op == NULL)
597 { 778 {
598 /* this should never happen */ 779 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 780 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600 return; 781 return;
601 } 782 }
602 783
603 if (op->env) 784 if (!op->is_on_map ())
604 { 785 {
605 /* Animation is currently handled by client, so nothing 786 /* Animation is currently handled by client, so nothing
606 * to do in this case. 787 * to do in this case.
607 */ 788 */
608 return; 789 return;
609 } 790 }
610
611 /* If the map is saving, don't do anything as everything is
612 * going to get freed anyways.
613 */
614 if (!op->map || op->map->in_memory == MAP_SAVING)
615 return;
616 791
617 /* make sure the object is within map boundaries */ 792 /* make sure the object is within map boundaries */
618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 793 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619 { 794 {
620 LOG (llevError, "update_object() called for object out of map!\n"); 795 LOG (llevError, "update_object() called for object out of map!\n");
628 803
629 if (!(m.flags_ & P_UPTODATE)) 804 if (!(m.flags_ & P_UPTODATE))
630 /* nop */; 805 /* nop */;
631 else if (action == UP_OBJ_INSERT) 806 else if (action == UP_OBJ_INSERT)
632 { 807 {
808#if 0
633 // this is likely overkill, TODO: revisit (schmorp) 809 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 812 || (op->is_player () && !(m.flags_ & P_PLAYER))
637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
639 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
640 || (m.move_on | op->move_on ) != m.move_on 816 || (m.move_on | op->move_on ) != m.move_on
641 || (m.move_off | op->move_off ) != m.move_off 817 || (m.move_off | op->move_off ) != m.move_off
642 || (m.move_slow | op->move_slow) != m.move_slow 818 || (m.move_slow | op->move_slow) != m.move_slow
643 /* This isn't perfect, but I don't expect a lot of objects to 819 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 820 * have move_allow right now.
645 */ 821 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 822 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
823 m.invalidate ();
824#else
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 825 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
648 m.flags_ = 0; 826 m.invalidate ();
827#endif
649 } 828 }
650 /* if the object is being removed, we can't make intelligent 829 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 830 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 831 * that is being removed.
653 */ 832 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = 0; 834 m.invalidate ();
656 else if (action == UP_OBJ_FACE) 835 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 836 /* Nothing to do for that case */ ;
658 else 837 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 838 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 839
664 843
665object::object () 844object::object ()
666{ 845{
667 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
668 847
669 expmul = 1.0; 848 //expmul = 1.0; declared const for the time being
670 face = blank_face; 849 face = blank_face;
671} 850}
672 851
673object::~object () 852object::~object ()
674{ 853{
680static int object_count; 859static int object_count;
681 860
682void object::link () 861void object::link ()
683{ 862{
684 assert (!index);//D 863 assert (!index);//D
685 uuid = gen_uuid (); 864 uuid = UUID::gen ();
686 count = ++object_count; 865 count = ++object_count;
687 866
688 refcnt_inc (); 867 refcnt_inc ();
689 objects.insert (this); 868 objects.insert (this);
690} 869}
704 /* If already on active list, don't do anything */ 883 /* If already on active list, don't do anything */
705 if (active) 884 if (active)
706 return; 885 return;
707 886
708 if (has_active_speed ()) 887 if (has_active_speed ())
888 {
889 if (flag [FLAG_FREED])
890 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
891
709 actives.insert (this); 892 actives.insert (this);
893 }
710} 894}
711 895
712void 896void
713object::activate_recursive () 897object::activate_recursive ()
714{ 898{
763object::destroy_inv (bool drop_to_ground) 947object::destroy_inv (bool drop_to_ground)
764{ 948{
765 // need to check first, because the checks below might segfault 949 // need to check first, because the checks below might segfault
766 // as we might be on an invalid mapspace and crossfire code 950 // as we might be on an invalid mapspace and crossfire code
767 // is too buggy to ensure that the inventory is empty. 951 // is too buggy to ensure that the inventory is empty.
768 // corollary: if you create arrows etc. with stuff in tis inventory, 952 // corollary: if you create arrows etc. with stuff in its inventory,
769 // cf will crash below with off-map x and y 953 // cf will crash below with off-map x and y
770 if (!inv) 954 if (!inv)
771 return; 955 return;
772 956
773 /* Only if the space blocks everything do we not process - 957 /* Only if the space blocks everything do we not process -
774 * if some form of movement is allowed, let objects 958 * if some form of movement is allowed, let objects
775 * drop on that space. 959 * drop on that space.
776 */ 960 */
777 if (!drop_to_ground 961 if (!drop_to_ground
778 || !map 962 || !map
779 || map->in_memory != MAP_IN_MEMORY 963 || map->in_memory != MAP_ACTIVE
780 || map->nodrop 964 || map->no_drop
781 || ms ().move_block == MOVE_ALL) 965 || ms ().move_block == MOVE_ALL)
782 { 966 {
783 while (inv) 967 while (inv)
784 {
785 inv->destroy_inv (drop_to_ground);
786 inv->destroy (); 968 inv->destroy ();
787 }
788 } 969 }
789 else 970 else
790 { /* Put objects in inventory onto this space */ 971 { /* Put objects in inventory onto this space */
791 while (inv) 972 while (inv)
792 { 973 {
810 object *op = new object; 991 object *op = new object;
811 op->link (); 992 op->link ();
812 return op; 993 return op;
813} 994}
814 995
996static struct freed_map : maptile
997{
998 freed_map ()
999 {
1000 path = "<freed objects map>";
1001 name = "/internal/freed_objects_map";
1002 width = 3;
1003 height = 3;
1004 no_drop = 1;
1005 no_reset = 1;
1006
1007 alloc ();
1008 in_memory = MAP_ACTIVE;
1009 }
1010
1011 ~freed_map ()
1012 {
1013 destroy ();
1014 }
1015} freed_map; // freed objects are moved here to avoid crashes
1016
815void 1017void
816object::do_destroy () 1018object::do_destroy ()
817{ 1019{
818 attachable::do_destroy ();
819
820 if (flag [FLAG_IS_LINKED]) 1020 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 1021 remove_link ();
822 1022
823 if (flag [FLAG_FRIENDLY]) 1023 if (flag [FLAG_FRIENDLY])
824 remove_friendly_object (this); 1024 remove_friendly_object (this);
825 1025
826 if (!flag [FLAG_REMOVED])
827 remove (); 1026 remove ();
828 1027
829 destroy_inv (true); 1028 attachable::do_destroy ();
830 1029
831 deactivate (); 1030 deactivate ();
832 unlink (); 1031 unlink ();
833 1032
834 flag [FLAG_FREED] = 1; 1033 flag [FLAG_FREED] = 1;
835 1034
836 // hack to ensure that freed objects still have a valid map 1035 // hack to ensure that freed objects still have a valid map
837 {
838 static maptile *freed_map; // freed objects are moved here to avoid crashes
839
840 if (!freed_map)
841 {
842 freed_map = new maptile;
843
844 freed_map->name = "/internal/freed_objects_map";
845 freed_map->width = 3;
846 freed_map->height = 3;
847
848 freed_map->alloc ();
849 freed_map->in_memory = MAP_IN_MEMORY;
850 }
851
852 map = freed_map; 1036 map = &freed_map;
853 x = 1; 1037 x = 1;
854 y = 1; 1038 y = 1;
855 }
856
857 head = 0;
858 1039
859 if (more) 1040 if (more)
860 { 1041 {
861 more->destroy (); 1042 more->destroy ();
862 more = 0; 1043 more = 0;
863 } 1044 }
864 1045
1046 head = 0;
1047
865 // clear those pointers that likely might have circular references to us 1048 // clear those pointers that likely might cause circular references
866 owner = 0; 1049 owner = 0;
867 enemy = 0; 1050 enemy = 0;
868 attacked_by = 0; 1051 attacked_by = 0;
1052 current_weapon = 0;
869} 1053}
870 1054
871void 1055void
872object::destroy (bool destroy_inventory) 1056object::destroy ()
873{ 1057{
874 if (destroyed ()) 1058 if (destroyed ())
875 return; 1059 return;
876 1060
877 if (destroy_inventory) 1061 if (!is_head () && !head->destroyed ())
1062 {
1063 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1064 head->destroy ();
1065 return;
1066 }
1067
878 destroy_inv (false); 1068 destroy_inv (false);
1069
1070 if (is_head ())
1071 if (sound_destroy)
1072 play_sound (sound_destroy);
1073 else if (flag [FLAG_MONSTER])
1074 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
879 1075
880 attachable::destroy (); 1076 attachable::destroy ();
881}
882
883/*
884 * sub_weight() recursively (outwards) subtracts a number from the
885 * weight of an object (and what is carried by it's environment(s)).
886 */
887void
888sub_weight (object *op, signed long weight)
889{
890 while (op != NULL)
891 {
892 if (op->type == CONTAINER)
893 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
894
895 op->carrying -= weight;
896 op = op->env;
897 }
898} 1077}
899 1078
900/* op->remove (): 1079/* op->remove ():
901 * This function removes the object op from the linked list of objects 1080 * This function removes the object op from the linked list of objects
902 * which it is currently tied to. When this function is done, the 1081 * which it is currently tied to. When this function is done, the
903 * object will have no environment. If the object previously had an 1082 * object will have no environment. If the object previously had an
904 * environment, the x and y coordinates will be updated to 1083 * environment, the x and y coordinates will be updated to
905 * the previous environment. 1084 * the previous environment.
906 * Beware: This function is called from the editor as well!
907 */ 1085 */
908void 1086void
909object::remove_slow () 1087object::do_remove ()
910{ 1088{
911 object *tmp, *last = 0; 1089 if (flag [FLAG_REMOVED])
912 object *otmp;
913
914 if (QUERY_FLAG (this, FLAG_REMOVED))
915 return; 1090 return;
916 1091
917 SET_FLAG (this, FLAG_REMOVED);
918 INVOKE_OBJECT (REMOVE, this); 1092 INVOKE_OBJECT (REMOVE, this);
1093
1094 flag [FLAG_REMOVED] = true;
919 1095
920 if (more) 1096 if (more)
921 more->remove (); 1097 more->remove ();
922 1098
923 /* 1099 /*
924 * In this case, the object to be removed is in someones 1100 * In this case, the object to be removed is in someones
925 * inventory. 1101 * inventory.
926 */ 1102 */
927 if (env) 1103 if (env)
928 { 1104 {
929 if (nrof) 1105 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
930 sub_weight (env, weight * nrof); 1106 if (object *pl = visible_to ())
931 else 1107 esrv_del_item (pl->contr, count);
932 sub_weight (env, weight + carrying); 1108 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1109
1110 adjust_weight (env, -total_weight ());
1111
1112 object *pl = in_player ();
1113
1114 /* we set up values so that it could be inserted into
1115 * the map, but we don't actually do that - it is up
1116 * to the caller to decide what we want to do.
1117 */
1118 map = env->map;
1119 x = env->x;
1120 y = env->y;
1121
1122 // make sure cmov optimisation is applicable
1123 *(above ? &above->below : &env->inv) = below;
1124 *(below ? &below->above : &above ) = above; // &above is just a dummy
1125
1126 above = 0;
1127 below = 0;
1128 env = 0;
933 1129
934 /* NO_FIX_PLAYER is set when a great many changes are being 1130 /* NO_FIX_PLAYER is set when a great many changes are being
935 * made to players inventory. If set, avoiding the call 1131 * made to players inventory. If set, avoiding the call
936 * to save cpu time. 1132 * to save cpu time.
937 */ 1133 */
938 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1134 if (pl)
1135 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1136 {
939 otmp->update_stats (); 1137 pl->update_stats ();
940 1138
941 if (above) 1139 if (glow_radius && pl->is_on_map ())
942 above->below = below; 1140 update_all_los (pl->map, pl->x, pl->y);
943 else 1141 }
944 env->inv = below;
945
946 if (below)
947 below->above = above;
948
949 /* we set up values so that it could be inserted into
950 * the map, but we don't actually do that - it is up
951 * to the caller to decide what we want to do.
952 */
953 x = env->x, y = env->y;
954 map = env->map;
955 above = 0, below = 0;
956 env = 0;
957 } 1142 }
958 else if (map) 1143 else if (map)
959 { 1144 {
960 if (type == PLAYER)
961 {
962 --map->players;
963 map->touch ();
964 }
965
966 map->dirty = true; 1145 map->dirty = true;
967 mapspace &ms = this->ms (); 1146 mapspace &ms = this->ms ();
968 1147
1148 if (object *pl = ms.player ())
1149 {
1150 if (is_player ())
1151 {
1152 if (!flag [FLAG_WIZPASS])
1153 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1154
1155 // leaving a spot always closes any open container on the ground
1156 if (container && !container->env)
1157 // this causes spurious floorbox updates, but it ensures
1158 // that the CLOSE event is being sent.
1159 close_container ();
1160
1161 --map->players;
1162 map->touch ();
1163 }
1164 else if (pl->container_ () == this)
1165 {
1166 // removing a container should close it
1167 close_container ();
1168 }
1169
1170 esrv_del_item (pl->contr, count);
1171 }
1172
969 /* link the object above us */ 1173 /* link the object above us */
970 if (above) 1174 // re-link, make sure compiler can easily use cmove
971 above->below = below; 1175 *(above ? &above->below : &ms.top) = below;
972 else 1176 *(below ? &below->above : &ms.bot) = above;
973 ms.top = below; /* we were top, set new top */
974
975 /* Relink the object below us, if there is one */
976 if (below)
977 below->above = above;
978 else
979 {
980 /* Nothing below, which means we need to relink map object for this space
981 * use translated coordinates in case some oddness with map tiling is
982 * evident
983 */
984 if (GET_MAP_OB (map, x, y) != this)
985 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
986
987 ms.bot = above; /* goes on above it. */
988 }
989 1177
990 above = 0; 1178 above = 0;
991 below = 0; 1179 below = 0;
992 1180
1181 ms.invalidate ();
1182
993 if (map->in_memory == MAP_SAVING) 1183 if (map->in_memory == MAP_SAVING)
994 return; 1184 return;
995 1185
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 1186 int check_walk_off = !flag [FLAG_NO_APPLY];
997 1187
998 for (tmp = ms.bot; tmp; tmp = tmp->above) 1188 if (object *pl = ms.player ())
999 { 1189 {
1000 /* No point updating the players look faces if he is the object 1190 if (pl->container_ () == this)
1001 * being removed.
1002 */
1003
1004 if (tmp->type == PLAYER && tmp != this)
1005 {
1006 /* If a container that the player is currently using somehow gets 1191 /* If a container that the player is currently using somehow gets
1007 * removed (most likely destroyed), update the player view 1192 * removed (most likely destroyed), update the player view
1008 * appropriately. 1193 * appropriately.
1009 */ 1194 */
1010 if (tmp->container == this) 1195 pl->close_container ();
1011 {
1012 flag [FLAG_APPLIED] = 0;
1013 tmp->container = 0;
1014 }
1015 1196
1197 //TODO: the floorbox prev/next might need updating
1198 //esrv_del_item (pl->contr, count);
1199 //TODO: update floorbox to preserve ordering
1016 if (tmp->contr->ns) 1200 if (pl->contr->ns)
1017 tmp->contr->ns->floorbox_update (); 1201 pl->contr->ns->floorbox_update ();
1202 }
1203
1204 if (check_walk_off)
1205 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1206 {
1207 above = tmp->above;
1208
1209 /* No point updating the players look faces if he is the object
1210 * being removed.
1018 } 1211 */
1019 1212
1020 /* See if object moving off should effect something */ 1213 /* See if object moving off should effect something */
1021 if (check_walk_off
1022 && ((move_type & tmp->move_off) 1214 if ((move_type & tmp->move_off)
1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1215 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1024 {
1025 move_apply (tmp, this, 0); 1216 move_apply (tmp, this, 0);
1026
1027 if (destroyed ())
1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1029 } 1217 }
1030 1218
1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1219 if (affects_los ())
1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1033 if (tmp->above == tmp)
1034 tmp->above = 0;
1035
1036 last = tmp;
1037 }
1038
1039 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object?
1041 if (!last)
1042 map->at (x, y).flags_ = 0;
1043 else
1044 update_object (last, UP_OBJ_REMOVE);
1045
1046 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1047 update_all_los (map, x, y); 1220 update_all_los (map, x, y);
1048 } 1221 }
1049} 1222}
1050 1223
1051/* 1224/*
1060merge_ob (object *op, object *top) 1233merge_ob (object *op, object *top)
1061{ 1234{
1062 if (!op->nrof) 1235 if (!op->nrof)
1063 return 0; 1236 return 0;
1064 1237
1065 if (top) 1238 if (!top)
1066 for (top = op; top && top->above; top = top->above) 1239 for (top = op; top && top->above; top = top->above)
1067 ; 1240 ;
1068 1241
1069 for (; top; top = top->below) 1242 for (; top; top = top->below)
1070 {
1071 if (top == op)
1072 continue;
1073
1074 if (object::can_merge (op, top)) 1243 if (object::can_merge (op, top))
1075 { 1244 {
1076 top->nrof += op->nrof; 1245 top->nrof += op->nrof;
1077 1246
1078/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1247 if (object *pl = top->visible_to ())
1079 op->weight = 0; /* Don't want any adjustements now */ 1248 esrv_update_item (UPD_NROF, pl, top);
1249
1250 op->weight = 0; // cancel the addition above
1251 op->carrying = 0; // must be 0 already
1252
1080 op->destroy (); 1253 op->destroy ();
1254
1081 return top; 1255 return top;
1082 } 1256 }
1083 }
1084 1257
1085 return 0; 1258 return 0;
1259}
1260
1261void
1262object::expand_tail ()
1263{
1264 if (more)
1265 return;
1266
1267 object *prev = this;
1268
1269 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1270 {
1271 object *op = arch_to_object (at);
1272
1273 op->name = name;
1274 op->name_pl = name_pl;
1275 op->title = title;
1276
1277 op->head = this;
1278 prev->more = op;
1279
1280 prev = op;
1281 }
1086} 1282}
1087 1283
1088/* 1284/*
1089 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1285 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters. 1286 * job preparing multi-part monsters.
1091 */ 1287 */
1092object * 1288object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1289insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1290{
1291 op->remove ();
1292
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1293 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1096 { 1294 {
1097 tmp->x = x + tmp->arch->clone.x; 1295 tmp->x = x + tmp->arch->x;
1098 tmp->y = y + tmp->arch->clone.y; 1296 tmp->y = y + tmp->arch->y;
1099 } 1297 }
1100 1298
1101 return insert_ob_in_map (op, m, originator, flag); 1299 return insert_ob_in_map (op, m, originator, flag);
1102} 1300}
1103 1301
1122 * just 'op' otherwise 1320 * just 'op' otherwise
1123 */ 1321 */
1124object * 1322object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1323insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1324{
1127 object *tmp, *top, *floor = NULL;
1128
1129 if (QUERY_FLAG (op, FLAG_FREED))
1130 {
1131 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL;
1133 }
1134
1135 if (!QUERY_FLAG (op, FLAG_REMOVED))
1136 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1137
1138 op->remove (); 1325 op->remove ();
1139 1326
1140 if (!m) 1327 if (m == &freed_map)//D TODO: remove soon
1141 { 1328 {//D
1142 char *dump = dump_object (op); 1329 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1144 free (dump);
1145 return op;
1146 } 1330 }//D
1147
1148 if (out_of_map (m, op->x, op->y))
1149 {
1150 char *dump = dump_object (op);
1151 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1152#ifdef MANY_CORES
1153 /* Better to catch this here, as otherwise the next use of this object
1154 * is likely to cause a crash. Better to find out where it is getting
1155 * improperly inserted.
1156 */
1157 abort ();
1158#endif
1159 free (dump);
1160 return op;
1161 }
1162
1163 if (object *more = op->more)
1164 {
1165 if (!insert_ob_in_map (more, m, originator, flag))
1166 {
1167 if (!op->head)
1168 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1169
1170 return 0;
1171 }
1172 }
1173
1174 CLEAR_FLAG (op, FLAG_REMOVED);
1175 1331
1176 /* Ideally, the caller figures this out. However, it complicates a lot 1332 /* Ideally, the caller figures this out. However, it complicates a lot
1177 * of areas of callers (eg, anything that uses find_free_spot would now 1333 * of areas of callers (eg, anything that uses find_free_spot would now
1178 * need extra work 1334 * need extra work
1179 */ 1335 */
1336 maptile *newmap = m;
1180 if (!xy_normalise (m, op->x, op->y)) 1337 if (!xy_normalise (newmap, op->x, op->y))
1338 {
1339 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1181 return 0; 1340 return 0;
1341 }
1182 1342
1343 if (object *more = op->more)
1344 if (!insert_ob_in_map (more, m, originator, flag))
1345 return 0;
1346
1347 op->flag [FLAG_REMOVED] = false;
1348 op->env = 0;
1183 op->map = m; 1349 op->map = newmap;
1350
1184 mapspace &ms = op->ms (); 1351 mapspace &ms = op->ms ();
1185 1352
1186 /* this has to be done after we translate the coordinates. 1353 /* this has to be done after we translate the coordinates.
1187 */ 1354 */
1188 if (op->nrof && !(flag & INS_NO_MERGE)) 1355 if (op->nrof && !(flag & INS_NO_MERGE))
1189 for (tmp = ms.bot; tmp; tmp = tmp->above) 1356 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1190 if (object::can_merge (op, tmp)) 1357 if (object::can_merge (op, tmp))
1191 { 1358 {
1359 // TODO: we actually want to update tmp, not op,
1360 // but some caller surely breaks when we return tmp
1361 // from here :/
1192 op->nrof += tmp->nrof; 1362 op->nrof += tmp->nrof;
1193 tmp->destroy (); 1363 tmp->destroy ();
1194 } 1364 }
1195 1365
1196 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1366 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1205 { 1375 {
1206 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1376 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1207 abort (); 1377 abort ();
1208 } 1378 }
1209 1379
1380 if (!originator->is_on_map ())
1381 {
1382 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1383 op->debug_desc (), originator->debug_desc ());
1384 abort ();
1385 }
1386
1210 op->above = originator; 1387 op->above = originator;
1211 op->below = originator->below; 1388 op->below = originator->below;
1212
1213 if (op->below)
1214 op->below->above = op;
1215 else
1216 ms.bot = op;
1217
1218 /* since *below* originator, no need to update top */
1219 originator->below = op; 1389 originator->below = op;
1390
1391 *(op->below ? &op->below->above : &ms.bot) = op;
1220 } 1392 }
1221 else 1393 else
1222 { 1394 {
1223 top = ms.bot; 1395 object *floor = 0;
1396 object *top = ms.top;
1224 1397
1225 /* If there are other objects, then */ 1398 /* If there are other objects, then */
1226 if ((!(flag & INS_MAP_LOAD)) && top) 1399 if (top)
1227 { 1400 {
1228 object *last = 0;
1229
1230 /* 1401 /*
1231 * If there are multiple objects on this space, we do some trickier handling. 1402 * If there are multiple objects on this space, we do some trickier handling.
1232 * We've already dealt with merging if appropriate. 1403 * We've already dealt with merging if appropriate.
1233 * Generally, we want to put the new object on top. But if 1404 * Generally, we want to put the new object on top. But if
1234 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1405 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1237 * once we get to them. This reduces the need to traverse over all of 1408 * once we get to them. This reduces the need to traverse over all of
1238 * them when adding another one - this saves quite a bit of cpu time 1409 * them when adding another one - this saves quite a bit of cpu time
1239 * when lots of spells are cast in one area. Currently, it is presumed 1410 * when lots of spells are cast in one area. Currently, it is presumed
1240 * that flying non pickable objects are spell objects. 1411 * that flying non pickable objects are spell objects.
1241 */ 1412 */
1242 for (top = ms.bot; top; top = top->above) 1413 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1243 { 1414 {
1244 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1415 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1245 floor = top; 1416 floor = tmp;
1246 1417
1247 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1418 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1248 { 1419 {
1249 /* We insert above top, so we want this object below this */ 1420 /* We insert above top, so we want this object below this */
1250 top = top->below; 1421 top = tmp->below;
1251 break; 1422 break;
1252 } 1423 }
1253 1424
1254 last = top; 1425 top = tmp;
1255 } 1426 }
1256
1257 /* Don't want top to be NULL, so set it to the last valid object */
1258 top = last;
1259 1427
1260 /* We let update_position deal with figuring out what the space 1428 /* We let update_position deal with figuring out what the space
1261 * looks like instead of lots of conditions here. 1429 * looks like instead of lots of conditions here.
1262 * makes things faster, and effectively the same result. 1430 * makes things faster, and effectively the same result.
1263 */ 1431 */
1264 1432
1265 /* Have object 'fall below' other objects that block view. 1433 /* Have object 'fall below' other objects that block view.
1266 * Unless those objects are exits, type 66 1434 * Unless those objects are exits.
1267 * If INS_ON_TOP is used, don't do this processing 1435 * If INS_ON_TOP is used, don't do this processing
1268 * Need to find the object that in fact blocks view, otherwise 1436 * Need to find the object that in fact blocks view, otherwise
1269 * stacking is a bit odd. 1437 * stacking is a bit odd.
1270 */ 1438 */
1271 if (!(flag & INS_ON_TOP) 1439 if (!(flag & INS_ON_TOP)
1272 && ms.flags () & P_BLOCKSVIEW 1440 && ms.flags () & P_BLOCKSVIEW
1273 && (op->face && !op->face->visibility)) 1441 && (op->face && !faces [op->face].visibility))
1274 { 1442 {
1443 object *last;
1444
1275 for (last = top; last != floor; last = last->below) 1445 for (last = top; last != floor; last = last->below)
1276 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1446 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1277 break; 1447 break;
1278 1448
1279 /* Check to see if we found the object that blocks view, 1449 /* Check to see if we found the object that blocks view,
1284 if (last && last->below && last != floor) 1454 if (last && last->below && last != floor)
1285 top = last->below; 1455 top = last->below;
1286 } 1456 }
1287 } /* If objects on this space */ 1457 } /* If objects on this space */
1288 1458
1289 if (flag & INS_MAP_LOAD)
1290 top = ms.top;
1291
1292 if (flag & INS_ABOVE_FLOOR_ONLY) 1459 if (flag & INS_ABOVE_FLOOR_ONLY)
1293 top = floor; 1460 top = floor;
1294 1461
1295 /* Top is the object that our object (op) is going to get inserted above. 1462 // insert object above top, or bottom-most if top = 0
1296 */
1297
1298 /* First object on this space */
1299 if (!top) 1463 if (!top)
1300 { 1464 {
1465 op->below = 0;
1301 op->above = ms.bot; 1466 op->above = ms.bot;
1302
1303 if (op->above)
1304 op->above->below = op;
1305
1306 op->below = 0;
1307 ms.bot = op; 1467 ms.bot = op;
1468
1469 *(op->above ? &op->above->below : &ms.top) = op;
1308 } 1470 }
1309 else 1471 else
1310 { /* get inserted into the stack above top */ 1472 {
1311 op->above = top->above; 1473 op->above = top->above;
1312
1313 if (op->above)
1314 op->above->below = op; 1474 top->above = op;
1315 1475
1316 op->below = top; 1476 op->below = top;
1317 top->above = op; 1477 *(op->above ? &op->above->below : &ms.top) = op;
1318 } 1478 }
1479 }
1319 1480
1320 if (!op->above) 1481 if (op->is_player ())
1321 ms.top = op;
1322 } /* else not INS_BELOW_ORIGINATOR */
1323
1324 if (op->type == PLAYER)
1325 { 1482 {
1326 op->contr->do_los = 1; 1483 op->contr->do_los = 1;
1327 ++op->map->players; 1484 ++op->map->players;
1328 op->map->touch (); 1485 op->map->touch ();
1329 } 1486 }
1330 1487
1331 op->map->dirty = true; 1488 op->map->dirty = true;
1332 1489
1333 /* If we have a floor, we know the player, if any, will be above
1334 * it, so save a few ticks and start from there.
1335 */
1336 if (!(flag & INS_MAP_LOAD))
1337 if (object *pl = ms.player ()) 1490 if (object *pl = ms.player ())
1491 //TODO: the floorbox prev/next might need updating
1492 //esrv_send_item (pl, op);
1493 //TODO: update floorbox to preserve ordering
1338 if (pl->contr->ns) 1494 if (pl->contr->ns)
1339 pl->contr->ns->floorbox_update (); 1495 pl->contr->ns->floorbox_update ();
1340 1496
1341 /* If this object glows, it may affect lighting conditions that are 1497 /* If this object glows, it may affect lighting conditions that are
1342 * visible to others on this map. But update_all_los is really 1498 * visible to others on this map. But update_all_los is really
1343 * an inefficient way to do this, as it means los for all players 1499 * an inefficient way to do this, as it means los for all players
1344 * on the map will get recalculated. The players could very well 1500 * on the map will get recalculated. The players could very well
1345 * be far away from this change and not affected in any way - 1501 * be far away from this change and not affected in any way -
1346 * this should get redone to only look for players within range, 1502 * this should get redone to only look for players within range,
1347 * or just updating the P_UPTODATE for spaces within this area 1503 * or just updating the P_UPTODATE for spaces within this area
1348 * of effect may be sufficient. 1504 * of effect may be sufficient.
1349 */ 1505 */
1350 if (op->map->darkness && (op->glow_radius != 0)) 1506 if (op->affects_los ())
1507 {
1508 op->ms ().invalidate ();
1351 update_all_los (op->map, op->x, op->y); 1509 update_all_los (op->map, op->x, op->y);
1510 }
1352 1511
1353 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1512 /* updates flags (blocked, alive, no magic, etc) for this map space */
1354 update_object (op, UP_OBJ_INSERT); 1513 update_object (op, UP_OBJ_INSERT);
1355 1514
1356 INVOKE_OBJECT (INSERT, op); 1515 INVOKE_OBJECT (INSERT, op);
1363 * blocked() and wall() work properly), and these flags are updated by 1522 * blocked() and wall() work properly), and these flags are updated by
1364 * update_object(). 1523 * update_object().
1365 */ 1524 */
1366 1525
1367 /* if this is not the head or flag has been passed, don't check walk on status */ 1526 /* if this is not the head or flag has been passed, don't check walk on status */
1368 if (!(flag & INS_NO_WALK_ON) && !op->head) 1527 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1369 { 1528 {
1370 if (check_move_on (op, originator)) 1529 if (check_move_on (op, originator))
1371 return 0; 1530 return 0;
1372 1531
1373 /* If we are a multi part object, lets work our way through the check 1532 /* If we are a multi part object, lets work our way through the check
1374 * walk on's. 1533 * walk on's.
1375 */ 1534 */
1376 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1535 for (object *tmp = op->more; tmp; tmp = tmp->more)
1377 if (check_move_on (tmp, originator)) 1536 if (check_move_on (tmp, originator))
1378 return 0; 1537 return 0;
1379 } 1538 }
1380 1539
1381 return op; 1540 return op;
1384/* this function inserts an object in the map, but if it 1543/* this function inserts an object in the map, but if it
1385 * finds an object of its own type, it'll remove that one first. 1544 * finds an object of its own type, it'll remove that one first.
1386 * op is the object to insert it under: supplies x and the map. 1545 * op is the object to insert it under: supplies x and the map.
1387 */ 1546 */
1388void 1547void
1389replace_insert_ob_in_map (const char *arch_string, object *op) 1548replace_insert_ob_in_map (shstr_tmp archname, object *op)
1390{ 1549{
1391 object *tmp, *tmp1;
1392
1393 /* first search for itself and remove any old instances */ 1550 /* first search for itself and remove any old instances */
1394 1551
1395 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1552 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1396 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1553 if (tmp->arch->archname == archname) /* same archetype */
1397 tmp->destroy (); 1554 tmp->destroy ();
1398 1555
1399 tmp1 = arch_to_object (archetype::find (arch_string)); 1556 object *tmp = arch_to_object (archetype::find (archname));
1400 1557
1401 tmp1->x = op->x; 1558 tmp->x = op->x;
1402 tmp1->y = op->y; 1559 tmp->y = op->y;
1560
1403 insert_ob_in_map (tmp1, op->map, op, 0); 1561 insert_ob_in_map (tmp, op->map, op, 0);
1404} 1562}
1405 1563
1406object * 1564object *
1407object::insert_at (object *where, object *originator, int flags) 1565object::insert_at (object *where, object *originator, int flags)
1408{ 1566{
1567 if (where->env)
1568 return where->env->insert (this);
1569 else
1409 where->map->insert (this, where->x, where->y, originator, flags); 1570 return where->map->insert (this, where->x, where->y, originator, flags);
1410} 1571}
1411 1572
1412/* 1573// check whether we can put this into the map, respect max_volume, max_items
1413 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1574bool
1414 * is returned contains nr objects, and the remaining parts contains 1575object::can_drop_at (maptile *m, int x, int y, object *originator)
1415 * the rest (or is removed and freed if that number is 0).
1416 * On failure, NULL is returned, and the reason put into the
1417 * global static errmsg array.
1418 */
1419object *
1420get_split_ob (object *orig_ob, uint32 nr)
1421{ 1576{
1422 object *newob; 1577 mapspace &ms = m->at (x, y);
1423 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1424 1578
1425 if (orig_ob->nrof < nr) 1579 int items = ms.items ();
1426 {
1427 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1428 return NULL;
1429 }
1430 1580
1431 newob = object_create_clone (orig_ob); 1581 if (!items // testing !items ensures we can drop at least one item
1582 || (items < m->max_items
1583 && ms.volume () < m->max_volume))
1584 return true;
1432 1585
1433 if ((orig_ob->nrof -= nr) < 1) 1586 if (originator && originator->is_player ())
1434 orig_ob->destroy (1); 1587 originator->contr->failmsg (format (
1435 else if (!is_removed) 1588 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1436 { 1589 query_name ()
1437 if (orig_ob->env != NULL) 1590 ));
1438 sub_weight (orig_ob->env, orig_ob->weight * nr);
1439 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1440 {
1441 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1442 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1443 return NULL;
1444 }
1445 }
1446 1591
1447 newob->nrof = nr; 1592 return false;
1448
1449 return newob;
1450} 1593}
1451 1594
1452/* 1595/*
1453 * decrease_ob_nr(object, number) decreases a specified number from 1596 * decrease(object, number) decreases a specified number from
1454 * the amount of an object. If the amount reaches 0, the object 1597 * the amount of an object. If the amount reaches 0, the object
1455 * is subsequently removed and freed. 1598 * is subsequently removed and freed.
1456 * 1599 *
1457 * Return value: 'op' if something is left, NULL if the amount reached 0 1600 * Return value: 'op' if something is left, NULL if the amount reached 0
1458 */ 1601 */
1602bool
1603object::decrease (sint32 nr)
1604{
1605 if (!nr)
1606 return true;
1459 1607
1608 nr = min (nr, nrof);
1609
1610 if (nrof > nr)
1611 {
1612 nrof -= nr;
1613 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1614
1615 if (object *pl = visible_to ())
1616 esrv_update_item (UPD_NROF, pl, this);
1617
1618 return true;
1619 }
1620 else
1621 {
1622 destroy ();
1623 return false;
1624 }
1625}
1626
1627/*
1628 * split(ob,nr) splits up ob into two parts. The part which
1629 * is returned contains nr objects, and the remaining parts contains
1630 * the rest (or is removed and returned if that number is 0).
1631 * On failure, NULL is returned.
1632 */
1460object * 1633object *
1461decrease_ob_nr (object *op, uint32 i) 1634object::split (sint32 nr)
1462{ 1635{
1463 object *tmp; 1636 int have = number_of ();
1464 1637
1465 if (i == 0) /* objects with op->nrof require this check */ 1638 if (have < nr)
1466 return op; 1639 return 0;
1467 1640 else if (have == nr)
1468 if (i > op->nrof)
1469 i = op->nrof;
1470
1471 if (QUERY_FLAG (op, FLAG_REMOVED))
1472 op->nrof -= i;
1473 else if (op->env)
1474 { 1641 {
1475 /* is this object in the players inventory, or sub container
1476 * therein?
1477 */
1478 tmp = op->in_player ();
1479 /* nope. Is this a container the player has opened?
1480 * If so, set tmp to that player.
1481 * IMO, searching through all the players will mostly
1482 * likely be quicker than following op->env to the map,
1483 * and then searching the map for a player.
1484 */
1485 if (!tmp)
1486 for_all_players (pl)
1487 if (pl->ob->container == op->env)
1488 {
1489 tmp = pl->ob;
1490 break;
1491 }
1492
1493 if (i < op->nrof)
1494 {
1495 sub_weight (op->env, op->weight * i);
1496 op->nrof -= i;
1497 if (tmp)
1498 esrv_send_item (tmp, op);
1499 }
1500 else
1501 {
1502 op->remove (); 1642 remove ();
1503 op->nrof = 0; 1643 return this;
1504 if (tmp)
1505 esrv_del_item (tmp->contr, op->count);
1506 }
1507 } 1644 }
1508 else 1645 else
1509 { 1646 {
1510 object *above = op->above; 1647 decrease (nr);
1511 1648
1512 if (i < op->nrof) 1649 object *op = deep_clone ();
1513 op->nrof -= i; 1650 op->nrof = nr;
1514 else
1515 {
1516 op->remove ();
1517 op->nrof = 0;
1518 }
1519
1520 /* Since we just removed op, op->above is null */
1521 for (tmp = above; tmp; tmp = tmp->above)
1522 if (tmp->type == PLAYER)
1523 {
1524 if (op->nrof)
1525 esrv_send_item (tmp, op);
1526 else
1527 esrv_del_item (tmp->contr, op->count);
1528 }
1529 }
1530
1531 if (op->nrof)
1532 return op; 1651 return op;
1533 else
1534 {
1535 op->destroy ();
1536 return 0;
1537 }
1538}
1539
1540/*
1541 * add_weight(object, weight) adds the specified weight to an object,
1542 * and also updates how much the environment(s) is/are carrying.
1543 */
1544
1545void
1546add_weight (object *op, signed long weight)
1547{
1548 while (op != NULL)
1549 {
1550 if (op->type == CONTAINER)
1551 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1552
1553 op->carrying += weight;
1554 op = op->env;
1555 } 1652 }
1556} 1653}
1557 1654
1558object * 1655object *
1559insert_ob_in_ob (object *op, object *where) 1656insert_ob_in_ob (object *op, object *where)
1564 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1661 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1565 free (dump); 1662 free (dump);
1566 return op; 1663 return op;
1567 } 1664 }
1568 1665
1569 if (where->head) 1666 if (where->head_ () != where)
1570 { 1667 {
1571 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1668 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1572 where = where->head; 1669 where = where->head;
1573 } 1670 }
1574 1671
1575 return where->insert (op); 1672 return where->insert (op);
1576} 1673}
1581 * inside the object environment. 1678 * inside the object environment.
1582 * 1679 *
1583 * The function returns now pointer to inserted item, and return value can 1680 * The function returns now pointer to inserted item, and return value can
1584 * be != op, if items are merged. -Tero 1681 * be != op, if items are merged. -Tero
1585 */ 1682 */
1586
1587object * 1683object *
1588object::insert (object *op) 1684object::insert (object *op)
1589{ 1685{
1590 object *tmp, *otmp;
1591
1592 if (!QUERY_FLAG (op, FLAG_REMOVED))
1593 op->remove ();
1594
1595 if (op->more) 1686 if (op->more)
1596 { 1687 {
1597 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1688 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1598 return op; 1689 return op;
1599 } 1690 }
1600 1691
1601 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1692 op->remove ();
1602 CLEAR_FLAG (op, FLAG_REMOVED); 1693
1694 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1695
1603 if (op->nrof) 1696 if (op->nrof)
1604 {
1605 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1697 for (object *tmp = inv; tmp; tmp = tmp->below)
1606 if (object::can_merge (tmp, op)) 1698 if (object::can_merge (tmp, op))
1607 { 1699 {
1608 /* return the original object and remove inserted object 1700 /* return the original object and remove inserted object
1609 (client needs the original object) */ 1701 (client needs the original object) */
1610 tmp->nrof += op->nrof; 1702 tmp->nrof += op->nrof;
1611 /* Weight handling gets pretty funky. Since we are adding to 1703
1612 * tmp->nrof, we need to increase the weight. 1704 if (object *pl = tmp->visible_to ())
1613 */ 1705 esrv_update_item (UPD_NROF, pl, tmp);
1706
1614 add_weight (this, op->weight * op->nrof); 1707 adjust_weight (this, op->total_weight ());
1615 SET_FLAG (op, FLAG_REMOVED); 1708
1616 op->destroy (); /* free the inserted object */ 1709 op->destroy ();
1617 op = tmp; 1710 op = tmp;
1618 op->remove (); /* and fix old object's links */ 1711 goto inserted;
1619 CLEAR_FLAG (op, FLAG_REMOVED);
1620 break;
1621 } 1712 }
1622 1713
1623 /* I assume combined objects have no inventory 1714 op->owner = 0; // it's his/hers now. period.
1624 * We add the weight - this object could have just been removed
1625 * (if it was possible to merge). calling remove_ob will subtract
1626 * the weight, so we need to add it in again, since we actually do
1627 * the linking below
1628 */
1629 add_weight (this, op->weight * op->nrof);
1630 }
1631 else
1632 add_weight (this, (op->weight + op->carrying));
1633
1634 otmp = this->in_player ();
1635 if (otmp && otmp->contr)
1636 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1637 otmp->update_stats ();
1638
1639 op->map = 0; 1715 op->map = 0;
1640 op->env = this; 1716 op->x = 0;
1717 op->y = 0;
1718
1641 op->above = 0; 1719 op->above = 0;
1642 op->below = 0; 1720 op->below = inv;
1643 op->x = 0, op->y = 0; 1721 op->env = this;
1644 1722
1723 if (inv)
1724 inv->above = op;
1725
1726 inv = op;
1727
1728 op->flag [FLAG_REMOVED] = 0;
1729
1730 if (object *pl = op->visible_to ())
1731 esrv_send_item (pl, op);
1732
1733 adjust_weight (this, op->total_weight ());
1734
1735inserted:
1645 /* reset the light list and los of the players on the map */ 1736 /* reset the light list and los of the players on the map */
1646 if ((op->glow_radius != 0) && map) 1737 if (op->glow_radius && is_on_map ())
1647 { 1738 {
1648#ifdef DEBUG_LIGHTS 1739 update_stats ();
1649 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1650#endif /* DEBUG_LIGHTS */
1651 if (map->darkness)
1652 update_all_los (map, x, y); 1740 update_all_los (map, x, y);
1653 }
1654
1655 /* Client has no idea of ordering so lets not bother ordering it here.
1656 * It sure simplifies this function...
1657 */
1658 if (!inv)
1659 inv = op;
1660 else
1661 { 1741 }
1662 op->below = inv; 1742 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663 op->below->above = op; 1743 // if this is a player's inventory, update stats
1664 inv = op; 1744 update_stats ();
1665 }
1666 1745
1667 INVOKE_OBJECT (INSERT, this); 1746 INVOKE_OBJECT (INSERT, this);
1668 1747
1669 return op; 1748 return op;
1670} 1749}
1690 * on top. 1769 * on top.
1691 */ 1770 */
1692int 1771int
1693check_move_on (object *op, object *originator) 1772check_move_on (object *op, object *originator)
1694{ 1773{
1774 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1775 return 0;
1776
1695 object *tmp; 1777 object *tmp;
1696 maptile *m = op->map; 1778 maptile *m = op->map;
1697 int x = op->x, y = op->y; 1779 int x = op->x, y = op->y;
1698 1780
1699 MoveType move_on, move_slow, move_block; 1781 mapspace &ms = m->at (x, y);
1700 1782
1701 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1783 ms.update ();
1702 return 0;
1703 1784
1704 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1785 MoveType move_on = ms.move_on;
1705 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1786 MoveType move_slow = ms.move_slow;
1706 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1787 MoveType move_block = ms.move_block;
1707 1788
1708 /* if nothing on this space will slow op down or be applied, 1789 /* if nothing on this space will slow op down or be applied,
1709 * no need to do checking below. have to make sure move_type 1790 * no need to do checking below. have to make sure move_type
1710 * is set, as lots of objects don't have it set - we treat that 1791 * is set, as lots of objects don't have it set - we treat that
1711 * as walking. 1792 * as walking.
1722 return 0; 1803 return 0;
1723 1804
1724 /* The objects have to be checked from top to bottom. 1805 /* The objects have to be checked from top to bottom.
1725 * Hence, we first go to the top: 1806 * Hence, we first go to the top:
1726 */ 1807 */
1727 1808 for (object *next, *tmp = ms.top; tmp; tmp = next)
1728 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1729 {
1730 /* Trim the search when we find the first other spell effect
1731 * this helps performance so that if a space has 50 spell objects,
1732 * we don't need to check all of them.
1733 */
1734 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1735 break;
1736 } 1809 {
1810 next = tmp->below;
1737 1811
1738 for (; tmp; tmp = tmp->below)
1739 {
1740 if (tmp == op) 1812 if (tmp == op)
1741 continue; /* Can't apply yourself */ 1813 continue; /* Can't apply yourself */
1742 1814
1743 /* Check to see if one of the movement types should be slowed down. 1815 /* Check to see if one of the movement types should be slowed down.
1744 * Second check makes sure that the movement types not being slowed 1816 * Second check makes sure that the movement types not being slowed
1749 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1821 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1750 { 1822 {
1751 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1823 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1752 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1824 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1753 { 1825 {
1754
1755 float
1756 diff = tmp->move_slow_penalty * fabs (op->speed); 1826 float diff = tmp->move_slow_penalty * fabs (op->speed);
1757 1827
1758 if (op->type == PLAYER) 1828 if (op->is_player ())
1759 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1829 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1760 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1830 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1761 diff /= 4.0; 1831 diff /= 4.0;
1762 1832
1763 op->speed_left -= diff; 1833 op->speed_left -= diff;
1764 } 1834 }
1765 } 1835 }
1798 LOG (llevError, "Present_arch called outside map.\n"); 1868 LOG (llevError, "Present_arch called outside map.\n");
1799 return NULL; 1869 return NULL;
1800 } 1870 }
1801 1871
1802 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1872 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1803 if (tmp->arch == at) 1873 if (tmp->arch->archname == at->archname)
1804 return tmp; 1874 return tmp;
1805 1875
1806 return NULL; 1876 return NULL;
1807} 1877}
1808 1878
1872 * The first matching object is returned, or NULL if none. 1942 * The first matching object is returned, or NULL if none.
1873 */ 1943 */
1874object * 1944object *
1875present_arch_in_ob (const archetype *at, const object *op) 1945present_arch_in_ob (const archetype *at, const object *op)
1876{ 1946{
1877 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1947 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1878 if (tmp->arch == at) 1948 if (tmp->arch->archname == at->archname)
1879 return tmp; 1949 return tmp;
1880 1950
1881 return NULL; 1951 return NULL;
1882} 1952}
1883 1953
1885 * activate recursively a flag on an object inventory 1955 * activate recursively a flag on an object inventory
1886 */ 1956 */
1887void 1957void
1888flag_inv (object *op, int flag) 1958flag_inv (object *op, int flag)
1889{ 1959{
1890 if (op->inv)
1891 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1960 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1892 { 1961 {
1893 SET_FLAG (tmp, flag); 1962 SET_FLAG (tmp, flag);
1894 flag_inv (tmp, flag); 1963 flag_inv (tmp, flag);
1895 } 1964 }
1896} 1965}
1897 1966
1898/* 1967/*
1899 * deactivate recursively a flag on an object inventory 1968 * deactivate recursively a flag on an object inventory
1900 */ 1969 */
1901void 1970void
1902unflag_inv (object *op, int flag) 1971unflag_inv (object *op, int flag)
1903{ 1972{
1904 if (op->inv)
1905 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1973 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1906 { 1974 {
1907 CLEAR_FLAG (tmp, flag); 1975 CLEAR_FLAG (tmp, flag);
1908 unflag_inv (tmp, flag); 1976 unflag_inv (tmp, flag);
1909 } 1977 }
1910}
1911
1912/*
1913 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1914 * all it's inventory (recursively).
1915 * If checksums are used, a player will get set_cheat called for
1916 * him/her-self and all object carried by a call to this function.
1917 */
1918void
1919set_cheat (object *op)
1920{
1921 SET_FLAG (op, FLAG_WAS_WIZ);
1922 flag_inv (op, FLAG_WAS_WIZ);
1923} 1978}
1924 1979
1925/* 1980/*
1926 * find_free_spot(object, map, x, y, start, stop) will search for 1981 * find_free_spot(object, map, x, y, start, stop) will search for
1927 * a spot at the given map and coordinates which will be able to contain 1982 * a spot at the given map and coordinates which will be able to contain
1929 * to search (see the freearr_x/y[] definition). 1984 * to search (see the freearr_x/y[] definition).
1930 * It returns a random choice among the alternatives found. 1985 * It returns a random choice among the alternatives found.
1931 * start and stop are where to start relative to the free_arr array (1,9 1986 * start and stop are where to start relative to the free_arr array (1,9
1932 * does all 4 immediate directions). This returns the index into the 1987 * does all 4 immediate directions). This returns the index into the
1933 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1988 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1934 * Note - this only checks to see if there is space for the head of the
1935 * object - if it is a multispace object, this should be called for all
1936 * pieces.
1937 * Note2: This function does correctly handle tiled maps, but does not 1989 * Note: This function does correctly handle tiled maps, but does not
1938 * inform the caller. However, insert_ob_in_map will update as 1990 * inform the caller. However, insert_ob_in_map will update as
1939 * necessary, so the caller shouldn't need to do any special work. 1991 * necessary, so the caller shouldn't need to do any special work.
1940 * Note - updated to take an object instead of archetype - this is necessary 1992 * Note - updated to take an object instead of archetype - this is necessary
1941 * because arch_blocked (now ob_blocked) needs to know the movement type 1993 * because arch_blocked (now ob_blocked) needs to know the movement type
1942 * to know if the space in question will block the object. We can't use 1994 * to know if the space in question will block the object. We can't use
1944 * customized, changed states, etc. 1996 * customized, changed states, etc.
1945 */ 1997 */
1946int 1998int
1947find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1999find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1948{ 2000{
2001 int altern[SIZEOFFREE];
1949 int index = 0, flag; 2002 int index = 0, flag;
1950 int altern[SIZEOFFREE];
1951 2003
1952 for (int i = start; i < stop; i++) 2004 for (int i = start; i < stop; i++)
1953 { 2005 {
1954 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2006 mapxy pos (m, x, y); pos.move (i);
1955 if (!flag) 2007
2008 if (!pos.normalise ())
2009 continue;
2010
2011 mapspace &ms = *pos;
2012
2013 if (ms.flags () & P_IS_ALIVE)
2014 continue;
2015
2016 /* However, often
2017 * ob doesn't have any move type (when used to place exits)
2018 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2019 */
2020 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2021 {
1956 altern [index++] = i; 2022 altern [index++] = i;
2023 continue;
2024 }
1957 2025
1958 /* Basically, if we find a wall on a space, we cut down the search size. 2026 /* Basically, if we find a wall on a space, we cut down the search size.
1959 * In this way, we won't return spaces that are on another side of a wall. 2027 * In this way, we won't return spaces that are on another side of a wall.
1960 * This mostly work, but it cuts down the search size in all directions - 2028 * This mostly work, but it cuts down the search size in all directions -
1961 * if the space being examined only has a wall to the north and empty 2029 * if the space being examined only has a wall to the north and empty
1962 * spaces in all the other directions, this will reduce the search space 2030 * spaces in all the other directions, this will reduce the search space
1963 * to only the spaces immediately surrounding the target area, and 2031 * to only the spaces immediately surrounding the target area, and
1964 * won't look 2 spaces south of the target space. 2032 * won't look 2 spaces south of the target space.
1965 */ 2033 */
1966 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2034 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2035 {
1967 stop = maxfree[i]; 2036 stop = maxfree[i];
2037 continue;
2038 }
2039
2040 /* Note it is intentional that we check ob - the movement type of the
2041 * head of the object should correspond for the entire object.
2042 */
2043 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2044 continue;
2045
2046 if (ob->blocked (pos.m, pos.x, pos.y))
2047 continue;
2048
2049 altern [index++] = i;
1968 } 2050 }
1969 2051
1970 if (!index) 2052 if (!index)
1971 return -1; 2053 return -1;
1972 2054
1973 return altern[RANDOM () % index]; 2055 return altern [rndm (index)];
1974} 2056}
1975 2057
1976/* 2058/*
1977 * find_first_free_spot(archetype, maptile, x, y) works like 2059 * find_first_free_spot(archetype, maptile, x, y) works like
1978 * find_free_spot(), but it will search max number of squares. 2060 * find_free_spot(), but it will search max number of squares.
1981 */ 2063 */
1982int 2064int
1983find_first_free_spot (const object *ob, maptile *m, int x, int y) 2065find_first_free_spot (const object *ob, maptile *m, int x, int y)
1984{ 2066{
1985 for (int i = 0; i < SIZEOFFREE; i++) 2067 for (int i = 0; i < SIZEOFFREE; i++)
1986 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2068 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
1987 return i; 2069 return i;
1988 2070
1989 return -1; 2071 return -1;
1990} 2072}
1991 2073
1999{ 2081{
2000 arr += begin; 2082 arr += begin;
2001 end -= begin; 2083 end -= begin;
2002 2084
2003 while (--end) 2085 while (--end)
2004 swap (arr [end], arr [RANDOM () % (end + 1)]); 2086 swap (arr [end], arr [rndm (end + 1)]);
2005} 2087}
2006 2088
2007/* new function to make monster searching more efficient, and effective! 2089/* new function to make monster searching more efficient, and effective!
2008 * This basically returns a randomized array (in the passed pointer) of 2090 * This basically returns a randomized array (in the passed pointer) of
2009 * the spaces to find monsters. In this way, it won't always look for 2091 * the spaces to find monsters. In this way, it won't always look for
2037 * there is capable of. 2119 * there is capable of.
2038 */ 2120 */
2039int 2121int
2040find_dir (maptile *m, int x, int y, object *exclude) 2122find_dir (maptile *m, int x, int y, object *exclude)
2041{ 2123{
2042 int i, max = SIZEOFFREE, mflags; 2124 int max = SIZEOFFREE, mflags;
2043
2044 sint16 nx, ny;
2045 object *tmp;
2046 maptile *mp;
2047
2048 MoveType blocked, move_type; 2125 MoveType move_type;
2049 2126
2050 if (exclude && exclude->head) 2127 if (exclude && exclude->head_ () != exclude)
2051 { 2128 {
2052 exclude = exclude->head; 2129 exclude = exclude->head;
2053 move_type = exclude->move_type; 2130 move_type = exclude->move_type;
2054 } 2131 }
2055 else 2132 else
2056 { 2133 {
2057 /* If we don't have anything, presume it can use all movement types. */ 2134 /* If we don't have anything, presume it can use all movement types. */
2058 move_type = MOVE_ALL; 2135 move_type = MOVE_ALL;
2059 } 2136 }
2060 2137
2061 for (i = 1; i < max; i++) 2138 for (int i = 1; i < max; i++)
2062 { 2139 {
2063 mp = m; 2140 mapxy pos (m, x, y);
2064 nx = x + freearr_x[i]; 2141 pos.move (i);
2065 ny = y + freearr_y[i];
2066 2142
2067 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 if (!pos.normalise ())
2068
2069 if (mflags & P_OUT_OF_MAP)
2070 max = maxfree[i]; 2144 max = maxfree[i];
2071 else 2145 else
2072 { 2146 {
2073 mapspace &ms = mp->at (nx, ny); 2147 mapspace &ms = *pos;
2074 2148
2075 blocked = ms.move_block;
2076
2077 if ((move_type & blocked) == move_type) 2149 if ((move_type & ms.move_block) == move_type)
2078 max = maxfree[i]; 2150 max = maxfree [i];
2079 else if (mflags & P_IS_ALIVE) 2151 else if (ms.flags () & P_IS_ALIVE)
2080 { 2152 {
2081 for (tmp = ms.bot; tmp; tmp = tmp->above) 2153 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2082 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2154 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2083 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2155 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2084 break;
2085
2086 if (tmp)
2087 return freedir[i]; 2156 return freedir [i];
2088 } 2157 }
2089 } 2158 }
2090 } 2159 }
2091 2160
2092 return 0; 2161 return 0;
2167 * This basically means that if direction is 15, then it could either go 2236 * This basically means that if direction is 15, then it could either go
2168 * direction 4, 14, or 16 to get back to where we are. 2237 * direction 4, 14, or 16 to get back to where we are.
2169 * Moved from spell_util.c to object.c with the other related direction 2238 * Moved from spell_util.c to object.c with the other related direction
2170 * functions. 2239 * functions.
2171 */ 2240 */
2172int reduction_dir[SIZEOFFREE][3] = { 2241static const int reduction_dir[SIZEOFFREE][3] = {
2173 {0, 0, 0}, /* 0 */ 2242 {0, 0, 0}, /* 0 */
2174 {0, 0, 0}, /* 1 */ 2243 {0, 0, 0}, /* 1 */
2175 {0, 0, 0}, /* 2 */ 2244 {0, 0, 0}, /* 2 */
2176 {0, 0, 0}, /* 3 */ 2245 {0, 0, 0}, /* 3 */
2177 {0, 0, 0}, /* 4 */ 2246 {0, 0, 0}, /* 4 */
2268 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2337 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2269 * core dumps if they do. 2338 * core dumps if they do.
2270 * 2339 *
2271 * Add a check so we can't pick up invisible objects (0.93.8) 2340 * Add a check so we can't pick up invisible objects (0.93.8)
2272 */ 2341 */
2273
2274int 2342int
2275can_pick (const object *who, const object *item) 2343can_pick (const object *who, const object *item)
2276{ 2344{
2277 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2345 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2278 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2346 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2279 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2347 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2280} 2348}
2281 2349
2282/* 2350/*
2283 * create clone from object to another 2351 * create clone from object to another
2284 */ 2352 */
2285object * 2353object *
2286object_create_clone (object *asrc) 2354object::deep_clone ()
2287{ 2355{
2288 object *dst = 0, *tmp, *src, *part, *prev, *item; 2356 assert (("deep_clone called on non-head object", is_head ()));
2289 2357
2290 if (!asrc) 2358 object *dst = clone ();
2291 return 0;
2292 2359
2293 src = asrc; 2360 object *prev = dst;
2294 if (src->head)
2295 src = src->head;
2296
2297 prev = 0;
2298 for (part = src; part; part = part->more) 2361 for (object *part = this->more; part; part = part->more)
2299 { 2362 {
2300 tmp = part->clone (); 2363 object *tmp = part->clone ();
2301 tmp->x -= src->x;
2302 tmp->y -= src->y;
2303
2304 if (!part->head)
2305 {
2306 dst = tmp;
2307 tmp->head = 0;
2308 }
2309 else
2310 tmp->head = dst; 2364 tmp->head = dst;
2311
2312 tmp->more = 0;
2313
2314 if (prev)
2315 prev->more = tmp; 2365 prev->more = tmp;
2316
2317 prev = tmp; 2366 prev = tmp;
2318 } 2367 }
2319 2368
2320 for (item = src->inv; item; item = item->below) 2369 for (object *item = inv; item; item = item->below)
2321 insert_ob_in_ob (object_create_clone (item), dst); 2370 insert_ob_in_ob (item->deep_clone (), dst);
2322 2371
2323 return dst; 2372 return dst;
2324}
2325
2326/* GROS - Creates an object using a string representing its content. */
2327/* Basically, we save the content of the string to a temp file, then call */
2328/* load_object on it. I admit it is a highly inefficient way to make things, */
2329/* but it was simple to make and allows reusing the load_object function. */
2330/* Remember not to use load_object_str in a time-critical situation. */
2331/* Also remember that multiparts objects are not supported for now. */
2332object *
2333load_object_str (const char *obstr)
2334{
2335 object *op;
2336 char filename[MAX_BUF];
2337
2338 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2339
2340 FILE *tempfile = fopen (filename, "w");
2341
2342 if (tempfile == NULL)
2343 {
2344 LOG (llevError, "Error - Unable to access load object temp file\n");
2345 return NULL;
2346 }
2347
2348 fprintf (tempfile, obstr);
2349 fclose (tempfile);
2350
2351 op = object::create ();
2352
2353 object_thawer thawer (filename);
2354
2355 if (thawer)
2356 load_object (thawer, op, 0);
2357
2358 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2359 CLEAR_FLAG (op, FLAG_REMOVED);
2360
2361 return op;
2362} 2373}
2363 2374
2364/* This returns the first object in who's inventory that 2375/* This returns the first object in who's inventory that
2365 * has the same type and subtype match. 2376 * has the same type and subtype match.
2366 * returns NULL if no match. 2377 * returns NULL if no match.
2373 return tmp; 2384 return tmp;
2374 2385
2375 return 0; 2386 return 0;
2376} 2387}
2377 2388
2378/* If ob has a field named key, return the link from the list, 2389shstr_tmp
2379 * otherwise return NULL. 2390object::kv_get (shstr_tmp key) const
2380 *
2381 * key must be a passed in shared string - otherwise, this won't
2382 * do the desired thing.
2383 */
2384key_value *
2385get_ob_key_link (const object *ob, const char *key)
2386{ 2391{
2387 for (key_value *link = ob->key_values; link; link = link->next) 2392 for (key_value *kv = key_values; kv; kv = kv->next)
2388 if (link->key == key) 2393 if (kv->key == key)
2389 return link;
2390
2391 return 0;
2392}
2393
2394/*
2395 * Returns the value of op has an extra_field for key, or NULL.
2396 *
2397 * The argument doesn't need to be a shared string.
2398 *
2399 * The returned string is shared.
2400 */
2401const char *
2402get_ob_key_value (const object *op, const char *const key)
2403{
2404 key_value *link;
2405 shstr_cmp canonical_key (key);
2406
2407 if (!canonical_key)
2408 {
2409 /* 1. There being a field named key on any object
2410 * implies there'd be a shared string to find.
2411 * 2. Since there isn't, no object has this field.
2412 * 3. Therefore, *this* object doesn't have this field.
2413 */
2414 return 0;
2415 }
2416
2417 /* This is copied from get_ob_key_link() above -
2418 * only 4 lines, and saves the function call overhead.
2419 */
2420 for (link = op->key_values; link; link = link->next)
2421 if (link->key == canonical_key)
2422 return link->value; 2394 return kv->value;
2423 2395
2424 return 0; 2396 return shstr ();
2425} 2397}
2426 2398
2427 2399void
2428/* 2400object::kv_set (shstr_tmp key, shstr_tmp value)
2429 * Updates the canonical_key in op to value.
2430 *
2431 * canonical_key is a shared string (value doesn't have to be).
2432 *
2433 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2434 * keys.
2435 *
2436 * Returns TRUE on success.
2437 */
2438int
2439set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2440{ 2401{
2441 key_value *field = NULL, *last = NULL; 2402 for (key_value *kv = key_values; kv; kv = kv->next)
2442 2403 if (kv->key == key)
2443 for (field = op->key_values; field != NULL; field = field->next)
2444 {
2445 if (field->key != canonical_key)
2446 { 2404 {
2447 last = field; 2405 kv->value = value;
2448 continue; 2406 return;
2449 } 2407 }
2450 2408
2451 if (value) 2409 key_value *kv = new key_value;
2452 field->value = value; 2410
2453 else 2411 kv->next = key_values;
2412 kv->key = key;
2413 kv->value = value;
2414
2415 key_values = kv;
2416}
2417
2418void
2419object::kv_del (shstr_tmp key)
2420{
2421 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2422 if ((*kvp)->key == key)
2454 { 2423 {
2455 /* Basically, if the archetype has this key set, 2424 key_value *kv = *kvp;
2456 * we need to store the null value so when we save 2425 *kvp = (*kvp)->next;
2457 * it, we save the empty value so that when we load, 2426 delete kv;
2458 * we get this value back again. 2427 return;
2459 */
2460 if (get_ob_key_link (&op->arch->clone, canonical_key))
2461 field->value = 0;
2462 else
2463 {
2464 if (last)
2465 last->next = field->next;
2466 else
2467 op->key_values = field->next;
2468
2469 delete field;
2470 }
2471 } 2428 }
2472 return TRUE;
2473 }
2474 /* IF we get here, key doesn't exist */
2475
2476 /* No field, we'll have to add it. */
2477
2478 if (!add_key)
2479 return FALSE;
2480
2481 /* There isn't any good reason to store a null
2482 * value in the key/value list. If the archetype has
2483 * this key, then we should also have it, so shouldn't
2484 * be here. If user wants to store empty strings,
2485 * should pass in ""
2486 */
2487 if (value == NULL)
2488 return TRUE;
2489
2490 field = new key_value;
2491
2492 field->key = canonical_key;
2493 field->value = value;
2494 /* Usual prepend-addition. */
2495 field->next = op->key_values;
2496 op->key_values = field;
2497
2498 return TRUE;
2499}
2500
2501/*
2502 * Updates the key in op to value.
2503 *
2504 * If add_key is FALSE, this will only update existing keys,
2505 * and not add new ones.
2506 * In general, should be little reason FALSE is ever passed in for add_key
2507 *
2508 * Returns TRUE on success.
2509 */
2510int
2511set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2512{
2513 shstr key_ (key);
2514
2515 return set_ob_key_value_s (op, key_, value, add_key);
2516} 2429}
2517 2430
2518object::depth_iterator::depth_iterator (object *container) 2431object::depth_iterator::depth_iterator (object *container)
2519: iterator_base (container) 2432: iterator_base (container)
2520{ 2433{
2533 item = item->inv; 2446 item = item->inv;
2534 } 2447 }
2535 else 2448 else
2536 item = item->env; 2449 item = item->env;
2537} 2450}
2538
2539 2451
2540const char * 2452const char *
2541object::flag_desc (char *desc, int len) const 2453object::flag_desc (char *desc, int len) const
2542{ 2454{
2543 char *p = desc; 2455 char *p = desc;
2571{ 2483{
2572 char flagdesc[512]; 2484 char flagdesc[512];
2573 char info2[256 * 4]; 2485 char info2[256 * 4];
2574 char *p = info; 2486 char *p = info;
2575 2487
2576 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2488 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2577 count, uuid.seq, 2489 count,
2490 uuid.c_str (),
2578 &name, 2491 &name,
2579 title ? "\",title:\"" : "", 2492 title ? ",title:\"" : "",
2580 title ? (const char *)title : "", 2493 title ? (const char *)title : "",
2494 title ? "\"" : "",
2581 flag_desc (flagdesc, 512), type); 2495 flag_desc (flagdesc, 512), type);
2582 2496
2583 if (env) 2497 if (!flag[FLAG_REMOVED] && env)
2584 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2498 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585 2499
2586 if (map) 2500 if (map)
2587 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2501 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2588 2502
2590} 2504}
2591 2505
2592const char * 2506const char *
2593object::debug_desc () const 2507object::debug_desc () const
2594{ 2508{
2595 static char info[256 * 4]; 2509 static char info[3][256 * 4];
2510 static int info_idx;
2511
2596 return debug_desc (info); 2512 return debug_desc (info [++info_idx % 3]);
2597} 2513}
2598 2514
2599const char * 2515struct region *
2600object::debug_desc2 () const 2516object::region () const
2601{ 2517{
2602 static char info[256 * 4]; 2518 return map ? map->region (x, y)
2603 return debug_desc (info); 2519 : region::default_region ();
2604} 2520}
2605 2521
2522void
2523object::open_container (object *new_container)
2524{
2525 if (container == new_container)
2526 return;
2527
2528 object *old_container = container;
2529
2530 if (old_container)
2531 {
2532 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2533 return;
2534
2535#if 0
2536 // remove the "Close old_container" object.
2537 if (object *closer = old_container->inv)
2538 if (closer->type == CLOSE_CON)
2539 closer->destroy ();
2540#endif
2541
2542 // make sure the container is available
2543 esrv_send_item (this, old_container);
2544
2545 old_container->flag [FLAG_APPLIED] = false;
2546 container = 0;
2547
2548 // client needs item update to make it work, client bug requires this to be separate
2549 esrv_update_item (UPD_FLAGS, this, old_container);
2550
2551 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2552 play_sound (sound_find ("chest_close"));
2553 }
2554
2555 if (new_container)
2556 {
2557 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2558 return;
2559
2560 // TODO: this does not seem to serve any purpose anymore?
2561#if 0
2562 // insert the "Close Container" object.
2563 if (archetype *closer = new_container->other_arch)
2564 {
2565 object *closer = arch_to_object (new_container->other_arch);
2566 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2567 new_container->insert (closer);
2568 }
2569#endif
2570
2571 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2572
2573 // make sure the container is available, client bug requires this to be separate
2574 esrv_send_item (this, new_container);
2575
2576 new_container->flag [FLAG_APPLIED] = true;
2577 container = new_container;
2578
2579 // client needs flag change
2580 esrv_update_item (UPD_FLAGS, this, new_container);
2581 esrv_send_inventory (this, new_container);
2582 play_sound (sound_find ("chest_open"));
2583 }
2584// else if (!old_container->env && contr && contr->ns)
2585// contr->ns->floorbox_reset ();
2586}
2587
2588object *
2589object::force_find (shstr_tmp name)
2590{
2591 /* cycle through his inventory to look for the MARK we want to
2592 * place
2593 */
2594 for (object *tmp = inv; tmp; tmp = tmp->below)
2595 if (tmp->type == FORCE && tmp->slaying == name)
2596 return splay (tmp);
2597
2598 return 0;
2599}
2600
2601//-GPL
2602
2603void
2604object::force_set_timer (int duration)
2605{
2606 this->duration = 1;
2607 this->speed_left = -1.f;
2608
2609 this->set_speed (duration ? 1.f / duration : 0.f);
2610}
2611
2612object *
2613object::force_add (shstr_tmp name, int duration)
2614{
2615 if (object *force = force_find (name))
2616 force->destroy ();
2617
2618 object *force = get_archetype (FORCE_NAME);
2619
2620 force->slaying = name;
2621 force->force_set_timer (duration);
2622 force->flag [FLAG_APPLIED] = true;
2623
2624 return insert (force);
2625}
2626
2627void
2628object::play_sound (faceidx sound) const
2629{
2630 if (!sound)
2631 return;
2632
2633 if (is_on_map ())
2634 map->play_sound (sound, x, y);
2635 else if (object *pl = in_player ())
2636 pl->contr->play_sound (sound);
2637}
2638
2639void
2640object::say_msg (const char *msg) const
2641{
2642 if (is_on_map ())
2643 map->say_msg (msg, x, y);
2644 else if (object *pl = in_player ())
2645 pl->contr->play_sound (sound);
2646}
2647
2648void
2649object::make_noise ()
2650{
2651 // we do not model noise in the map, so instead put
2652 // a temporary light into the noise source
2653 // could use the map instead, but that's less reliable for our
2654 // goal, which is to make invisibility a bit harder to exploit
2655
2656 // currently only works sensibly for players
2657 if (!is_player ())
2658 return;
2659
2660 // find old force, or create new one
2661 object *force = force_find (shstr_noise_force);
2662
2663 if (force)
2664 force->speed_left = -1.f; // patch old speed up
2665 else
2666 {
2667 force = archetype::get (shstr_noise_force);
2668
2669 force->slaying = shstr_noise_force;
2670 force->stats.food = 1;
2671 force->speed_left = -1.f;
2672
2673 force->set_speed (1.f / 4.f);
2674 force->flag [FLAG_IS_USED_UP] = true;
2675 force->flag [FLAG_APPLIED] = true;
2676
2677 insert (force);
2678 }
2679}
2680

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines