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.120 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.303 by root, Tue Nov 10 04:38:45 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->material != ob2->material
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;
850 material = &material_null;
671} 851}
672 852
673object::~object () 853object::~object ()
674{ 854{
675 if (index)
676 unlink (); 855 unlink ();
677 856
678 free_key_values (this); 857 free_key_values (this);
679} 858}
680 859
681static int object_count; 860static int object_count;
682 861
683void object::link () 862void object::link ()
684{ 863{
685 assert (!index);//D 864 assert (!index);//D
686 uuid = gen_uuid (); 865 uuid = UUID::gen ();
687 count = ++object_count; 866 count = ++object_count;
688 867
689 refcnt_inc (); 868 refcnt_inc ();
690 objects.insert (this); 869 objects.insert (this);
691} 870}
692 871
693void object::unlink () 872void object::unlink ()
694{ 873{
695 assert (index);//D 874 if (!index)
875 return;
876
696 objects.erase (this); 877 objects.erase (this);
697 refcnt_dec (); 878 refcnt_dec ();
698} 879}
699 880
700void 881void
703 /* If already on active list, don't do anything */ 884 /* If already on active list, don't do anything */
704 if (active) 885 if (active)
705 return; 886 return;
706 887
707 if (has_active_speed ()) 888 if (has_active_speed ())
889 {
890 if (flag [FLAG_FREED])
891 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
892
708 actives.insert (this); 893 actives.insert (this);
894 }
709} 895}
710 896
711void 897void
712object::activate_recursive () 898object::activate_recursive ()
713{ 899{
762object::destroy_inv (bool drop_to_ground) 948object::destroy_inv (bool drop_to_ground)
763{ 949{
764 // need to check first, because the checks below might segfault 950 // need to check first, because the checks below might segfault
765 // as we might be on an invalid mapspace and crossfire code 951 // as we might be on an invalid mapspace and crossfire code
766 // is too buggy to ensure that the inventory is empty. 952 // is too buggy to ensure that the inventory is empty.
767 // corollary: if you create arrows etc. with stuff in tis inventory, 953 // corollary: if you create arrows etc. with stuff in its inventory,
768 // cf will crash below with off-map x and y 954 // cf will crash below with off-map x and y
769 if (!inv) 955 if (!inv)
770 return; 956 return;
771 957
772 /* Only if the space blocks everything do we not process - 958 /* Only if the space blocks everything do we not process -
773 * if some form of movement is allowed, let objects 959 * if some form of movement is allowed, let objects
774 * drop on that space. 960 * drop on that space.
775 */ 961 */
776 if (!drop_to_ground 962 if (!drop_to_ground
777 || !map 963 || !map
778 || map->in_memory != MAP_IN_MEMORY 964 || map->in_memory != MAP_ACTIVE
965 || map->no_drop
779 || ms ().move_block == MOVE_ALL) 966 || ms ().move_block == MOVE_ALL)
780 { 967 {
781 while (inv) 968 while (inv)
782 {
783 inv->destroy_inv (drop_to_ground);
784 inv->destroy (); 969 inv->destroy ();
785 }
786 } 970 }
787 else 971 else
788 { /* Put objects in inventory onto this space */ 972 { /* Put objects in inventory onto this space */
789 while (inv) 973 while (inv)
790 { 974 {
808 object *op = new object; 992 object *op = new object;
809 op->link (); 993 op->link ();
810 return op; 994 return op;
811} 995}
812 996
997static struct freed_map : maptile
998{
999 freed_map ()
1000 {
1001 path = "<freed objects map>";
1002 name = "/internal/freed_objects_map";
1003 width = 3;
1004 height = 3;
1005 no_drop = 1;
1006 no_reset = 1;
1007
1008 alloc ();
1009 in_memory = MAP_ACTIVE;
1010 }
1011
1012 ~freed_map ()
1013 {
1014 destroy ();
1015 }
1016} freed_map; // freed objects are moved here to avoid crashes
1017
813void 1018void
814object::do_destroy () 1019object::do_destroy ()
815{ 1020{
816 attachable::do_destroy ();
817
818 if (flag [FLAG_IS_LINKED]) 1021 if (flag [FLAG_IS_LINKED])
819 remove_button_link (this); 1022 remove_link ();
820 1023
821 if (flag [FLAG_FRIENDLY]) 1024 if (flag [FLAG_FRIENDLY])
822 remove_friendly_object (this); 1025 remove_friendly_object (this);
823 1026
824 if (!flag [FLAG_REMOVED])
825 remove (); 1027 remove ();
826 1028
827 destroy_inv (true); 1029 attachable::do_destroy ();
828 1030
829 deactivate (); 1031 deactivate ();
830 unlink (); 1032 unlink ();
831 1033
832 flag [FLAG_FREED] = 1; 1034 flag [FLAG_FREED] = 1;
833 1035
834 // hack to ensure that freed objects still have a valid map 1036 // hack to ensure that freed objects still have a valid map
835 {
836 static maptile *freed_map; // freed objects are moved here to avoid crashes
837
838 if (!freed_map)
839 {
840 freed_map = new maptile;
841
842 freed_map->name = "/internal/freed_objects_map";
843 freed_map->width = 3;
844 freed_map->height = 3;
845
846 freed_map->alloc ();
847 freed_map->in_memory = MAP_IN_MEMORY;
848 }
849
850 map = freed_map; 1037 map = &freed_map;
851 x = 1; 1038 x = 1;
852 y = 1; 1039 y = 1;
853 }
854
855 head = 0;
856 1040
857 if (more) 1041 if (more)
858 { 1042 {
859 more->destroy (); 1043 more->destroy ();
860 more = 0; 1044 more = 0;
861 } 1045 }
862 1046
1047 head = 0;
1048
863 // clear those pointers that likely might have circular references to us 1049 // clear those pointers that likely might cause circular references
864 owner = 0; 1050 owner = 0;
865 enemy = 0; 1051 enemy = 0;
866 attacked_by = 0; 1052 attacked_by = 0;
1053 current_weapon = 0;
867} 1054}
868 1055
869void 1056void
870object::destroy (bool destroy_inventory) 1057object::destroy ()
871{ 1058{
872 if (destroyed ()) 1059 if (destroyed ())
873 return; 1060 return;
874 1061
875 if (destroy_inventory) 1062 if (!is_head () && !head->destroyed ())
1063 {
1064 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1065 head->destroy ();
1066 return;
1067 }
1068
876 destroy_inv (false); 1069 destroy_inv (false);
1070
1071 if (is_head ())
1072 if (sound_destroy)
1073 play_sound (sound_destroy);
1074 else if (flag [FLAG_MONSTER])
1075 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
877 1076
878 attachable::destroy (); 1077 attachable::destroy ();
879}
880
881/*
882 * sub_weight() recursively (outwards) subtracts a number from the
883 * weight of an object (and what is carried by it's environment(s)).
884 */
885void
886sub_weight (object *op, signed long weight)
887{
888 while (op != NULL)
889 {
890 if (op->type == CONTAINER)
891 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
892
893 op->carrying -= weight;
894 op = op->env;
895 }
896} 1078}
897 1079
898/* op->remove (): 1080/* op->remove ():
899 * This function removes the object op from the linked list of objects 1081 * This function removes the object op from the linked list of objects
900 * which it is currently tied to. When this function is done, the 1082 * which it is currently tied to. When this function is done, the
901 * object will have no environment. If the object previously had an 1083 * object will have no environment. If the object previously had an
902 * environment, the x and y coordinates will be updated to 1084 * environment, the x and y coordinates will be updated to
903 * the previous environment. 1085 * the previous environment.
904 * Beware: This function is called from the editor as well!
905 */ 1086 */
906void 1087void
907object::remove_slow () 1088object::do_remove ()
908{ 1089{
909 object *tmp, *last = 0; 1090 if (flag [FLAG_REMOVED])
910 object *otmp;
911
912 if (QUERY_FLAG (this, FLAG_REMOVED))
913 return; 1091 return;
914 1092
915 SET_FLAG (this, FLAG_REMOVED);
916 INVOKE_OBJECT (REMOVE, this); 1093 INVOKE_OBJECT (REMOVE, this);
1094
1095 flag [FLAG_REMOVED] = true;
917 1096
918 if (more) 1097 if (more)
919 more->remove (); 1098 more->remove ();
920 1099
921 /* 1100 /*
922 * In this case, the object to be removed is in someones 1101 * In this case, the object to be removed is in someones
923 * inventory. 1102 * inventory.
924 */ 1103 */
925 if (env) 1104 if (env)
926 { 1105 {
927 if (nrof) 1106 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
928 sub_weight (env, weight * nrof); 1107 if (object *pl = visible_to ())
929 else 1108 esrv_del_item (pl->contr, count);
930 sub_weight (env, weight + carrying); 1109 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1110
1111 adjust_weight (env, -total_weight ());
1112
1113 object *pl = in_player ();
1114
1115 /* we set up values so that it could be inserted into
1116 * the map, but we don't actually do that - it is up
1117 * to the caller to decide what we want to do.
1118 */
1119 map = env->map;
1120 x = env->x;
1121 y = env->y;
1122
1123 // make sure cmov optimisation is applicable
1124 *(above ? &above->below : &env->inv) = below;
1125 *(below ? &below->above : &above ) = above; // &above is just a dummy
1126
1127 above = 0;
1128 below = 0;
1129 env = 0;
931 1130
932 /* NO_FIX_PLAYER is set when a great many changes are being 1131 /* NO_FIX_PLAYER is set when a great many changes are being
933 * made to players inventory. If set, avoiding the call 1132 * made to players inventory. If set, avoiding the call
934 * to save cpu time. 1133 * to save cpu time.
935 */ 1134 */
936 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1135 if (pl)
1136 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1137 {
937 otmp->update_stats (); 1138 pl->update_stats ();
938 1139
939 if (above) 1140 if (glow_radius && pl->is_on_map ())
940 above->below = below; 1141 update_all_los (pl->map, pl->x, pl->y);
941 else 1142 }
942 env->inv = below;
943
944 if (below)
945 below->above = above;
946
947 /* we set up values so that it could be inserted into
948 * the map, but we don't actually do that - it is up
949 * to the caller to decide what we want to do.
950 */
951 x = env->x, y = env->y;
952 map = env->map;
953 above = 0, below = 0;
954 env = 0;
955 } 1143 }
956 else if (map) 1144 else if (map)
957 { 1145 {
958 if (type == PLAYER)
959 {
960 --map->players;
961 map->touch ();
962 }
963
964 map->dirty = true; 1146 map->dirty = true;
965 mapspace &ms = this->ms (); 1147 mapspace &ms = this->ms ();
966 1148
1149 if (object *pl = ms.player ())
1150 {
1151 if (is_player ())
1152 {
1153 if (!flag [FLAG_WIZPASS])
1154 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1155
1156 // leaving a spot always closes any open container on the ground
1157 if (container && !container->env)
1158 // this causes spurious floorbox updates, but it ensures
1159 // that the CLOSE event is being sent.
1160 close_container ();
1161
1162 --map->players;
1163 map->touch ();
1164 }
1165 else if (pl->container_ () == this)
1166 {
1167 // removing a container should close it
1168 close_container ();
1169 }
1170
1171 esrv_del_item (pl->contr, count);
1172 }
1173
967 /* link the object above us */ 1174 /* link the object above us */
968 if (above) 1175 // re-link, make sure compiler can easily use cmove
969 above->below = below; 1176 *(above ? &above->below : &ms.top) = below;
970 else 1177 *(below ? &below->above : &ms.bot) = above;
971 ms.top = below; /* we were top, set new top */
972
973 /* Relink the object below us, if there is one */
974 if (below)
975 below->above = above;
976 else
977 {
978 /* Nothing below, which means we need to relink map object for this space
979 * use translated coordinates in case some oddness with map tiling is
980 * evident
981 */
982 if (GET_MAP_OB (map, x, y) != this)
983 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 ());
984
985 ms.bot = above; /* goes on above it. */
986 }
987 1178
988 above = 0; 1179 above = 0;
989 below = 0; 1180 below = 0;
990 1181
1182 ms.invalidate ();
1183
991 if (map->in_memory == MAP_SAVING) 1184 if (map->in_memory == MAP_SAVING)
992 return; 1185 return;
993 1186
994 int check_walk_off = !flag [FLAG_NO_APPLY]; 1187 int check_walk_off = !flag [FLAG_NO_APPLY];
995 1188
996 for (tmp = ms.bot; tmp; tmp = tmp->above) 1189 if (object *pl = ms.player ())
997 { 1190 {
998 /* No point updating the players look faces if he is the object 1191 if (pl->container_ () == this)
999 * being removed.
1000 */
1001
1002 if (tmp->type == PLAYER && tmp != this)
1003 {
1004 /* If a container that the player is currently using somehow gets 1192 /* If a container that the player is currently using somehow gets
1005 * removed (most likely destroyed), update the player view 1193 * removed (most likely destroyed), update the player view
1006 * appropriately. 1194 * appropriately.
1007 */ 1195 */
1008 if (tmp->container == this) 1196 pl->close_container ();
1009 {
1010 flag [FLAG_APPLIED] = 0;
1011 tmp->container = 0;
1012 }
1013 1197
1198 //TODO: the floorbox prev/next might need updating
1199 //esrv_del_item (pl->contr, count);
1200 //TODO: update floorbox to preserve ordering
1014 if (tmp->contr->ns) 1201 if (pl->contr->ns)
1015 tmp->contr->ns->floorbox_update (); 1202 pl->contr->ns->floorbox_update ();
1203 }
1204
1205 if (check_walk_off)
1206 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1207 {
1208 above = tmp->above;
1209
1210 /* No point updating the players look faces if he is the object
1211 * being removed.
1016 } 1212 */
1017 1213
1018 /* See if object moving off should effect something */ 1214 /* See if object moving off should effect something */
1019 if (check_walk_off
1020 && ((move_type & tmp->move_off) 1215 if ((move_type & tmp->move_off)
1021 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1216 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1022 {
1023 move_apply (tmp, this, 0); 1217 move_apply (tmp, this, 0);
1024
1025 if (destroyed ())
1026 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1027 } 1218 }
1028 1219
1029 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1220 if (affects_los ())
1030 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1031 if (tmp->above == tmp)
1032 tmp->above = 0;
1033
1034 last = tmp;
1035 }
1036
1037 /* last == NULL if there are no objects on this space */
1038 //TODO: this makes little sense, why only update the topmost object?
1039 if (!last)
1040 map->at (x, y).flags_ = 0;
1041 else
1042 update_object (last, UP_OBJ_REMOVE);
1043
1044 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1045 update_all_los (map, x, y); 1221 update_all_los (map, x, y);
1046 } 1222 }
1047} 1223}
1048 1224
1049/* 1225/*
1058merge_ob (object *op, object *top) 1234merge_ob (object *op, object *top)
1059{ 1235{
1060 if (!op->nrof) 1236 if (!op->nrof)
1061 return 0; 1237 return 0;
1062 1238
1063 if (top) 1239 if (!top)
1064 for (top = op; top && top->above; top = top->above) 1240 for (top = op; top && top->above; top = top->above)
1065 ; 1241 ;
1066 1242
1067 for (; top; top = top->below) 1243 for (; top; top = top->below)
1068 {
1069 if (top == op)
1070 continue;
1071
1072 if (object::can_merge (op, top)) 1244 if (object::can_merge (op, top))
1073 { 1245 {
1074 top->nrof += op->nrof; 1246 top->nrof += op->nrof;
1075 1247
1076/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1248 if (object *pl = top->visible_to ())
1077 op->weight = 0; /* Don't want any adjustements now */ 1249 esrv_update_item (UPD_NROF, pl, top);
1250
1251 op->weight = 0; // cancel the addition above
1252 op->carrying = 0; // must be 0 already
1253
1078 op->destroy (); 1254 op->destroy ();
1255
1079 return top; 1256 return top;
1080 } 1257 }
1081 }
1082 1258
1083 return 0; 1259 return 0;
1260}
1261
1262void
1263object::expand_tail ()
1264{
1265 if (more)
1266 return;
1267
1268 object *prev = this;
1269
1270 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1271 {
1272 object *op = arch_to_object (at);
1273
1274 op->name = name;
1275 op->name_pl = name_pl;
1276 op->title = title;
1277
1278 op->head = this;
1279 prev->more = op;
1280
1281 prev = op;
1282 }
1084} 1283}
1085 1284
1086/* 1285/*
1087 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1286 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1088 * job preparing multi-part monsters. 1287 * job preparing multi-part monsters.
1089 */ 1288 */
1090object * 1289object *
1091insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1290insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1092{ 1291{
1292 op->remove ();
1293
1093 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1294 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1094 { 1295 {
1095 tmp->x = x + tmp->arch->clone.x; 1296 tmp->x = x + tmp->arch->x;
1096 tmp->y = y + tmp->arch->clone.y; 1297 tmp->y = y + tmp->arch->y;
1097 } 1298 }
1098 1299
1099 return insert_ob_in_map (op, m, originator, flag); 1300 return insert_ob_in_map (op, m, originator, flag);
1100} 1301}
1101 1302
1120 * just 'op' otherwise 1321 * just 'op' otherwise
1121 */ 1322 */
1122object * 1323object *
1123insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1324insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1124{ 1325{
1125 object *tmp, *top, *floor = NULL;
1126
1127 if (QUERY_FLAG (op, FLAG_FREED))
1128 {
1129 LOG (llevError, "Trying to insert freed object!\n");
1130 return NULL;
1131 }
1132
1133 if (!QUERY_FLAG (op, FLAG_REMOVED))
1134 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1135
1136 op->remove (); 1326 op->remove ();
1137 1327
1138 if (!m) 1328 if (m == &freed_map)//D TODO: remove soon
1139 { 1329 {//D
1140 char *dump = dump_object (op); 1330 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1142 free (dump);
1143 return op;
1144 } 1331 }//D
1145
1146 if (out_of_map (m, op->x, op->y))
1147 {
1148 char *dump = dump_object (op);
1149 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1150#ifdef MANY_CORES
1151 /* Better to catch this here, as otherwise the next use of this object
1152 * is likely to cause a crash. Better to find out where it is getting
1153 * improperly inserted.
1154 */
1155 abort ();
1156#endif
1157 free (dump);
1158 return op;
1159 }
1160
1161 if (object *more = op->more)
1162 {
1163 if (!insert_ob_in_map (more, m, originator, flag))
1164 {
1165 if (!op->head)
1166 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1167
1168 return 0;
1169 }
1170 }
1171
1172 CLEAR_FLAG (op, FLAG_REMOVED);
1173 1332
1174 /* Ideally, the caller figures this out. However, it complicates a lot 1333 /* Ideally, the caller figures this out. However, it complicates a lot
1175 * of areas of callers (eg, anything that uses find_free_spot would now 1334 * of areas of callers (eg, anything that uses find_free_spot would now
1176 * need extra work 1335 * need extra work
1177 */ 1336 */
1337 maptile *newmap = m;
1178 if (!xy_normalise (m, op->x, op->y)) 1338 if (!xy_normalise (newmap, op->x, op->y))
1339 {
1340 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1179 return 0; 1341 return 0;
1342 }
1180 1343
1344 if (object *more = op->more)
1345 if (!insert_ob_in_map (more, m, originator, flag))
1346 return 0;
1347
1348 op->flag [FLAG_REMOVED] = false;
1349 op->env = 0;
1181 op->map = m; 1350 op->map = newmap;
1351
1182 mapspace &ms = op->ms (); 1352 mapspace &ms = op->ms ();
1183 1353
1184 /* this has to be done after we translate the coordinates. 1354 /* this has to be done after we translate the coordinates.
1185 */ 1355 */
1186 if (op->nrof && !(flag & INS_NO_MERGE)) 1356 if (op->nrof && !(flag & INS_NO_MERGE))
1187 for (tmp = ms.bot; tmp; tmp = tmp->above) 1357 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1188 if (object::can_merge (op, tmp)) 1358 if (object::can_merge (op, tmp))
1189 { 1359 {
1360 // TODO: we actually want to update tmp, not op,
1361 // but some caller surely breaks when we return tmp
1362 // from here :/
1190 op->nrof += tmp->nrof; 1363 op->nrof += tmp->nrof;
1191 tmp->destroy (); 1364 tmp->destroy ();
1192 } 1365 }
1193 1366
1194 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1367 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1203 { 1376 {
1204 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1377 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1205 abort (); 1378 abort ();
1206 } 1379 }
1207 1380
1381 if (!originator->is_on_map ())
1382 {
1383 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1384 op->debug_desc (), originator->debug_desc ());
1385 abort ();
1386 }
1387
1208 op->above = originator; 1388 op->above = originator;
1209 op->below = originator->below; 1389 op->below = originator->below;
1210
1211 if (op->below)
1212 op->below->above = op;
1213 else
1214 ms.bot = op;
1215
1216 /* since *below* originator, no need to update top */
1217 originator->below = op; 1390 originator->below = op;
1391
1392 *(op->below ? &op->below->above : &ms.bot) = op;
1218 } 1393 }
1219 else 1394 else
1220 { 1395 {
1221 top = ms.bot; 1396 object *floor = 0;
1397 object *top = ms.top;
1222 1398
1223 /* If there are other objects, then */ 1399 /* If there are other objects, then */
1224 if ((!(flag & INS_MAP_LOAD)) && top) 1400 if (top)
1225 { 1401 {
1226 object *last = 0;
1227
1228 /* 1402 /*
1229 * If there are multiple objects on this space, we do some trickier handling. 1403 * If there are multiple objects on this space, we do some trickier handling.
1230 * We've already dealt with merging if appropriate. 1404 * We've already dealt with merging if appropriate.
1231 * Generally, we want to put the new object on top. But if 1405 * Generally, we want to put the new object on top. But if
1232 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1406 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1235 * once we get to them. This reduces the need to traverse over all of 1409 * once we get to them. This reduces the need to traverse over all of
1236 * them when adding another one - this saves quite a bit of cpu time 1410 * them when adding another one - this saves quite a bit of cpu time
1237 * when lots of spells are cast in one area. Currently, it is presumed 1411 * when lots of spells are cast in one area. Currently, it is presumed
1238 * that flying non pickable objects are spell objects. 1412 * that flying non pickable objects are spell objects.
1239 */ 1413 */
1240 for (top = ms.bot; top; top = top->above) 1414 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1241 { 1415 {
1242 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1416 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1243 floor = top; 1417 floor = tmp;
1244 1418
1245 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1419 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1246 { 1420 {
1247 /* We insert above top, so we want this object below this */ 1421 /* We insert above top, so we want this object below this */
1248 top = top->below; 1422 top = tmp->below;
1249 break; 1423 break;
1250 } 1424 }
1251 1425
1252 last = top; 1426 top = tmp;
1253 } 1427 }
1254
1255 /* Don't want top to be NULL, so set it to the last valid object */
1256 top = last;
1257 1428
1258 /* We let update_position deal with figuring out what the space 1429 /* We let update_position deal with figuring out what the space
1259 * looks like instead of lots of conditions here. 1430 * looks like instead of lots of conditions here.
1260 * makes things faster, and effectively the same result. 1431 * makes things faster, and effectively the same result.
1261 */ 1432 */
1262 1433
1263 /* Have object 'fall below' other objects that block view. 1434 /* Have object 'fall below' other objects that block view.
1264 * Unless those objects are exits, type 66 1435 * Unless those objects are exits.
1265 * If INS_ON_TOP is used, don't do this processing 1436 * If INS_ON_TOP is used, don't do this processing
1266 * Need to find the object that in fact blocks view, otherwise 1437 * Need to find the object that in fact blocks view, otherwise
1267 * stacking is a bit odd. 1438 * stacking is a bit odd.
1268 */ 1439 */
1269 if (!(flag & INS_ON_TOP) 1440 if (!(flag & INS_ON_TOP)
1270 && ms.flags () & P_BLOCKSVIEW 1441 && ms.flags () & P_BLOCKSVIEW
1271 && (op->face && !op->face->visibility)) 1442 && (op->face && !faces [op->face].visibility))
1272 { 1443 {
1444 object *last;
1445
1273 for (last = top; last != floor; last = last->below) 1446 for (last = top; last != floor; last = last->below)
1274 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1447 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1275 break; 1448 break;
1276 1449
1277 /* Check to see if we found the object that blocks view, 1450 /* Check to see if we found the object that blocks view,
1282 if (last && last->below && last != floor) 1455 if (last && last->below && last != floor)
1283 top = last->below; 1456 top = last->below;
1284 } 1457 }
1285 } /* If objects on this space */ 1458 } /* If objects on this space */
1286 1459
1287 if (flag & INS_MAP_LOAD)
1288 top = ms.top;
1289
1290 if (flag & INS_ABOVE_FLOOR_ONLY) 1460 if (flag & INS_ABOVE_FLOOR_ONLY)
1291 top = floor; 1461 top = floor;
1292 1462
1293 /* Top is the object that our object (op) is going to get inserted above. 1463 // insert object above top, or bottom-most if top = 0
1294 */
1295
1296 /* First object on this space */
1297 if (!top) 1464 if (!top)
1298 { 1465 {
1466 op->below = 0;
1299 op->above = ms.bot; 1467 op->above = ms.bot;
1300
1301 if (op->above)
1302 op->above->below = op;
1303
1304 op->below = 0;
1305 ms.bot = op; 1468 ms.bot = op;
1469
1470 *(op->above ? &op->above->below : &ms.top) = op;
1306 } 1471 }
1307 else 1472 else
1308 { /* get inserted into the stack above top */ 1473 {
1309 op->above = top->above; 1474 op->above = top->above;
1310
1311 if (op->above)
1312 op->above->below = op; 1475 top->above = op;
1313 1476
1314 op->below = top; 1477 op->below = top;
1315 top->above = op; 1478 *(op->above ? &op->above->below : &ms.top) = op;
1316 } 1479 }
1480 }
1317 1481
1318 if (!op->above) 1482 if (op->is_player ())
1319 ms.top = op;
1320 } /* else not INS_BELOW_ORIGINATOR */
1321
1322 if (op->type == PLAYER)
1323 { 1483 {
1324 op->contr->do_los = 1; 1484 op->contr->do_los = 1;
1325 ++op->map->players; 1485 ++op->map->players;
1326 op->map->touch (); 1486 op->map->touch ();
1327 } 1487 }
1328 1488
1329 op->map->dirty = true; 1489 op->map->dirty = true;
1330 1490
1331 /* If we have a floor, we know the player, if any, will be above
1332 * it, so save a few ticks and start from there.
1333 */
1334 if (!(flag & INS_MAP_LOAD))
1335 if (object *pl = ms.player ()) 1491 if (object *pl = ms.player ())
1492 //TODO: the floorbox prev/next might need updating
1493 //esrv_send_item (pl, op);
1494 //TODO: update floorbox to preserve ordering
1336 if (pl->contr->ns) 1495 if (pl->contr->ns)
1337 pl->contr->ns->floorbox_update (); 1496 pl->contr->ns->floorbox_update ();
1338 1497
1339 /* If this object glows, it may affect lighting conditions that are 1498 /* If this object glows, it may affect lighting conditions that are
1340 * visible to others on this map. But update_all_los is really 1499 * visible to others on this map. But update_all_los is really
1341 * an inefficient way to do this, as it means los for all players 1500 * an inefficient way to do this, as it means los for all players
1342 * on the map will get recalculated. The players could very well 1501 * on the map will get recalculated. The players could very well
1343 * be far away from this change and not affected in any way - 1502 * be far away from this change and not affected in any way -
1344 * this should get redone to only look for players within range, 1503 * this should get redone to only look for players within range,
1345 * or just updating the P_UPTODATE for spaces within this area 1504 * or just updating the P_UPTODATE for spaces within this area
1346 * of effect may be sufficient. 1505 * of effect may be sufficient.
1347 */ 1506 */
1348 if (op->map->darkness && (op->glow_radius != 0)) 1507 if (op->affects_los ())
1508 {
1509 op->ms ().invalidate ();
1349 update_all_los (op->map, op->x, op->y); 1510 update_all_los (op->map, op->x, op->y);
1511 }
1350 1512
1351 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1513 /* updates flags (blocked, alive, no magic, etc) for this map space */
1352 update_object (op, UP_OBJ_INSERT); 1514 update_object (op, UP_OBJ_INSERT);
1353 1515
1354 INVOKE_OBJECT (INSERT, op); 1516 INVOKE_OBJECT (INSERT, op);
1361 * blocked() and wall() work properly), and these flags are updated by 1523 * blocked() and wall() work properly), and these flags are updated by
1362 * update_object(). 1524 * update_object().
1363 */ 1525 */
1364 1526
1365 /* if this is not the head or flag has been passed, don't check walk on status */ 1527 /* if this is not the head or flag has been passed, don't check walk on status */
1366 if (!(flag & INS_NO_WALK_ON) && !op->head) 1528 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1367 { 1529 {
1368 if (check_move_on (op, originator)) 1530 if (check_move_on (op, originator))
1369 return 0; 1531 return 0;
1370 1532
1371 /* If we are a multi part object, lets work our way through the check 1533 /* If we are a multi part object, lets work our way through the check
1372 * walk on's. 1534 * walk on's.
1373 */ 1535 */
1374 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1536 for (object *tmp = op->more; tmp; tmp = tmp->more)
1375 if (check_move_on (tmp, originator)) 1537 if (check_move_on (tmp, originator))
1376 return 0; 1538 return 0;
1377 } 1539 }
1378 1540
1379 return op; 1541 return op;
1382/* this function inserts an object in the map, but if it 1544/* this function inserts an object in the map, but if it
1383 * finds an object of its own type, it'll remove that one first. 1545 * finds an object of its own type, it'll remove that one first.
1384 * op is the object to insert it under: supplies x and the map. 1546 * op is the object to insert it under: supplies x and the map.
1385 */ 1547 */
1386void 1548void
1387replace_insert_ob_in_map (const char *arch_string, object *op) 1549replace_insert_ob_in_map (shstr_tmp archname, object *op)
1388{ 1550{
1389 object *tmp, *tmp1;
1390
1391 /* first search for itself and remove any old instances */ 1551 /* first search for itself and remove any old instances */
1392 1552
1393 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1553 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1394 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1554 if (tmp->arch->archname == archname) /* same archetype */
1395 tmp->destroy (); 1555 tmp->destroy ();
1396 1556
1397 tmp1 = arch_to_object (archetype::find (arch_string)); 1557 object *tmp = arch_to_object (archetype::find (archname));
1398 1558
1399 tmp1->x = op->x; 1559 tmp->x = op->x;
1400 tmp1->y = op->y; 1560 tmp->y = op->y;
1561
1401 insert_ob_in_map (tmp1, op->map, op, 0); 1562 insert_ob_in_map (tmp, op->map, op, 0);
1402} 1563}
1403 1564
1404object * 1565object *
1405object::insert_at (object *where, object *originator, int flags) 1566object::insert_at (object *where, object *originator, int flags)
1406{ 1567{
1568 if (where->env)
1569 return where->env->insert (this);
1570 else
1407 where->map->insert (this, where->x, where->y, originator, flags); 1571 return where->map->insert (this, where->x, where->y, originator, flags);
1408} 1572}
1409 1573
1410/* 1574// check whether we can put this into the map, respect max_volume, max_items
1411 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1575bool
1412 * is returned contains nr objects, and the remaining parts contains 1576object::can_drop_at (maptile *m, int x, int y, object *originator)
1413 * the rest (or is removed and freed if that number is 0).
1414 * On failure, NULL is returned, and the reason put into the
1415 * global static errmsg array.
1416 */
1417object *
1418get_split_ob (object *orig_ob, uint32 nr)
1419{ 1577{
1420 object *newob; 1578 mapspace &ms = m->at (x, y);
1421 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1422 1579
1423 if (orig_ob->nrof < nr) 1580 int items = ms.items ();
1424 {
1425 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1426 return NULL;
1427 }
1428 1581
1429 newob = object_create_clone (orig_ob); 1582 if (!items // testing !items ensures we can drop at least one item
1583 || (items < m->max_items
1584 && ms.volume () < m->max_volume))
1585 return true;
1430 1586
1431 if ((orig_ob->nrof -= nr) < 1) 1587 if (originator && originator->is_player ())
1432 orig_ob->destroy (1); 1588 originator->contr->failmsg (format (
1433 else if (!is_removed) 1589 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1434 { 1590 query_name ()
1435 if (orig_ob->env != NULL) 1591 ));
1436 sub_weight (orig_ob->env, orig_ob->weight * nr);
1437 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1438 {
1439 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1440 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1441 return NULL;
1442 }
1443 }
1444 1592
1445 newob->nrof = nr; 1593 return false;
1446
1447 return newob;
1448} 1594}
1449 1595
1450/* 1596/*
1451 * decrease_ob_nr(object, number) decreases a specified number from 1597 * decrease(object, number) decreases a specified number from
1452 * the amount of an object. If the amount reaches 0, the object 1598 * the amount of an object. If the amount reaches 0, the object
1453 * is subsequently removed and freed. 1599 * is subsequently removed and freed.
1454 * 1600 *
1455 * Return value: 'op' if something is left, NULL if the amount reached 0 1601 * Return value: 'op' if something is left, NULL if the amount reached 0
1456 */ 1602 */
1603bool
1604object::decrease (sint32 nr)
1605{
1606 if (!nr)
1607 return true;
1457 1608
1609 nr = min (nr, nrof);
1610
1611 if (nrof > nr)
1612 {
1613 nrof -= nr;
1614 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1615
1616 if (object *pl = visible_to ())
1617 esrv_update_item (UPD_NROF, pl, this);
1618
1619 return true;
1620 }
1621 else
1622 {
1623 destroy ();
1624 return false;
1625 }
1626}
1627
1628/*
1629 * split(ob,nr) splits up ob into two parts. The part which
1630 * is returned contains nr objects, and the remaining parts contains
1631 * the rest (or is removed and returned if that number is 0).
1632 * On failure, NULL is returned.
1633 */
1458object * 1634object *
1459decrease_ob_nr (object *op, uint32 i) 1635object::split (sint32 nr)
1460{ 1636{
1461 object *tmp; 1637 int have = number_of ();
1462 1638
1463 if (i == 0) /* objects with op->nrof require this check */ 1639 if (have < nr)
1464 return op; 1640 return 0;
1465 1641 else if (have == nr)
1466 if (i > op->nrof)
1467 i = op->nrof;
1468
1469 if (QUERY_FLAG (op, FLAG_REMOVED))
1470 op->nrof -= i;
1471 else if (op->env)
1472 { 1642 {
1473 /* is this object in the players inventory, or sub container
1474 * therein?
1475 */
1476 tmp = op->in_player ();
1477 /* nope. Is this a container the player has opened?
1478 * If so, set tmp to that player.
1479 * IMO, searching through all the players will mostly
1480 * likely be quicker than following op->env to the map,
1481 * and then searching the map for a player.
1482 */
1483 if (!tmp)
1484 for_all_players (pl)
1485 if (pl->ob->container == op->env)
1486 {
1487 tmp = pl->ob;
1488 break;
1489 }
1490
1491 if (i < op->nrof)
1492 {
1493 sub_weight (op->env, op->weight * i);
1494 op->nrof -= i;
1495 if (tmp)
1496 esrv_send_item (tmp, op);
1497 }
1498 else
1499 {
1500 op->remove (); 1643 remove ();
1501 op->nrof = 0; 1644 return this;
1502 if (tmp)
1503 esrv_del_item (tmp->contr, op->count);
1504 }
1505 } 1645 }
1506 else 1646 else
1507 { 1647 {
1508 object *above = op->above; 1648 decrease (nr);
1509 1649
1510 if (i < op->nrof) 1650 object *op = deep_clone ();
1511 op->nrof -= i; 1651 op->nrof = nr;
1512 else
1513 {
1514 op->remove ();
1515 op->nrof = 0;
1516 }
1517
1518 /* Since we just removed op, op->above is null */
1519 for (tmp = above; tmp; tmp = tmp->above)
1520 if (tmp->type == PLAYER)
1521 {
1522 if (op->nrof)
1523 esrv_send_item (tmp, op);
1524 else
1525 esrv_del_item (tmp->contr, op->count);
1526 }
1527 }
1528
1529 if (op->nrof)
1530 return op; 1652 return op;
1531 else
1532 {
1533 op->destroy ();
1534 return 0;
1535 }
1536}
1537
1538/*
1539 * add_weight(object, weight) adds the specified weight to an object,
1540 * and also updates how much the environment(s) is/are carrying.
1541 */
1542
1543void
1544add_weight (object *op, signed long weight)
1545{
1546 while (op != NULL)
1547 {
1548 if (op->type == CONTAINER)
1549 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1550
1551 op->carrying += weight;
1552 op = op->env;
1553 } 1653 }
1554} 1654}
1555 1655
1556object * 1656object *
1557insert_ob_in_ob (object *op, object *where) 1657insert_ob_in_ob (object *op, object *where)
1562 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1662 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1563 free (dump); 1663 free (dump);
1564 return op; 1664 return op;
1565 } 1665 }
1566 1666
1567 if (where->head) 1667 if (where->head_ () != where)
1568 { 1668 {
1569 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1669 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1570 where = where->head; 1670 where = where->head;
1571 } 1671 }
1572 1672
1573 return where->insert (op); 1673 return where->insert (op);
1574} 1674}
1579 * inside the object environment. 1679 * inside the object environment.
1580 * 1680 *
1581 * The function returns now pointer to inserted item, and return value can 1681 * The function returns now pointer to inserted item, and return value can
1582 * be != op, if items are merged. -Tero 1682 * be != op, if items are merged. -Tero
1583 */ 1683 */
1584
1585object * 1684object *
1586object::insert (object *op) 1685object::insert (object *op)
1587{ 1686{
1588 object *tmp, *otmp;
1589
1590 if (!QUERY_FLAG (op, FLAG_REMOVED))
1591 op->remove ();
1592
1593 if (op->more) 1687 if (op->more)
1594 { 1688 {
1595 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1689 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1596 return op; 1690 return op;
1597 } 1691 }
1598 1692
1599 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1693 op->remove ();
1600 CLEAR_FLAG (op, FLAG_REMOVED); 1694
1695 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1696
1601 if (op->nrof) 1697 if (op->nrof)
1602 {
1603 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1698 for (object *tmp = inv; tmp; tmp = tmp->below)
1604 if (object::can_merge (tmp, op)) 1699 if (object::can_merge (tmp, op))
1605 { 1700 {
1606 /* return the original object and remove inserted object 1701 /* return the original object and remove inserted object
1607 (client needs the original object) */ 1702 (client needs the original object) */
1608 tmp->nrof += op->nrof; 1703 tmp->nrof += op->nrof;
1609 /* Weight handling gets pretty funky. Since we are adding to 1704
1610 * tmp->nrof, we need to increase the weight. 1705 if (object *pl = tmp->visible_to ())
1611 */ 1706 esrv_update_item (UPD_NROF, pl, tmp);
1707
1612 add_weight (this, op->weight * op->nrof); 1708 adjust_weight (this, op->total_weight ());
1613 SET_FLAG (op, FLAG_REMOVED); 1709
1614 op->destroy (); /* free the inserted object */ 1710 op->destroy ();
1615 op = tmp; 1711 op = tmp;
1616 op->remove (); /* and fix old object's links */ 1712 goto inserted;
1617 CLEAR_FLAG (op, FLAG_REMOVED);
1618 break;
1619 } 1713 }
1620 1714
1621 /* I assume combined objects have no inventory 1715 op->owner = 0; // it's his/hers now. period.
1622 * We add the weight - this object could have just been removed
1623 * (if it was possible to merge). calling remove_ob will subtract
1624 * the weight, so we need to add it in again, since we actually do
1625 * the linking below
1626 */
1627 add_weight (this, op->weight * op->nrof);
1628 }
1629 else
1630 add_weight (this, (op->weight + op->carrying));
1631
1632 otmp = this->in_player ();
1633 if (otmp && otmp->contr)
1634 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1635 otmp->update_stats ();
1636
1637 op->map = 0; 1716 op->map = 0;
1638 op->env = this; 1717 op->x = 0;
1718 op->y = 0;
1719
1639 op->above = 0; 1720 op->above = 0;
1640 op->below = 0; 1721 op->below = inv;
1641 op->x = 0, op->y = 0; 1722 op->env = this;
1642 1723
1724 if (inv)
1725 inv->above = op;
1726
1727 inv = op;
1728
1729 op->flag [FLAG_REMOVED] = 0;
1730
1731 if (object *pl = op->visible_to ())
1732 esrv_send_item (pl, op);
1733
1734 adjust_weight (this, op->total_weight ());
1735
1736inserted:
1643 /* reset the light list and los of the players on the map */ 1737 /* reset the light list and los of the players on the map */
1644 if ((op->glow_radius != 0) && map) 1738 if (op->glow_radius && is_on_map ())
1645 { 1739 {
1646#ifdef DEBUG_LIGHTS 1740 update_stats ();
1647 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1648#endif /* DEBUG_LIGHTS */
1649 if (map->darkness)
1650 update_all_los (map, x, y); 1741 update_all_los (map, x, y);
1651 }
1652
1653 /* Client has no idea of ordering so lets not bother ordering it here.
1654 * It sure simplifies this function...
1655 */
1656 if (!inv)
1657 inv = op;
1658 else
1659 { 1742 }
1660 op->below = inv; 1743 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1661 op->below->above = op; 1744 // if this is a player's inventory, update stats
1662 inv = op; 1745 update_stats ();
1663 }
1664 1746
1665 INVOKE_OBJECT (INSERT, this); 1747 INVOKE_OBJECT (INSERT, this);
1666 1748
1667 return op; 1749 return op;
1668} 1750}
1688 * on top. 1770 * on top.
1689 */ 1771 */
1690int 1772int
1691check_move_on (object *op, object *originator) 1773check_move_on (object *op, object *originator)
1692{ 1774{
1775 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1776 return 0;
1777
1693 object *tmp; 1778 object *tmp;
1694 maptile *m = op->map; 1779 maptile *m = op->map;
1695 int x = op->x, y = op->y; 1780 int x = op->x, y = op->y;
1696 1781
1697 MoveType move_on, move_slow, move_block; 1782 mapspace &ms = m->at (x, y);
1698 1783
1699 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1784 ms.update ();
1700 return 0;
1701 1785
1702 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1786 MoveType move_on = ms.move_on;
1703 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1787 MoveType move_slow = ms.move_slow;
1704 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1788 MoveType move_block = ms.move_block;
1705 1789
1706 /* if nothing on this space will slow op down or be applied, 1790 /* if nothing on this space will slow op down or be applied,
1707 * no need to do checking below. have to make sure move_type 1791 * no need to do checking below. have to make sure move_type
1708 * is set, as lots of objects don't have it set - we treat that 1792 * is set, as lots of objects don't have it set - we treat that
1709 * as walking. 1793 * as walking.
1720 return 0; 1804 return 0;
1721 1805
1722 /* The objects have to be checked from top to bottom. 1806 /* The objects have to be checked from top to bottom.
1723 * Hence, we first go to the top: 1807 * Hence, we first go to the top:
1724 */ 1808 */
1725 1809 for (object *next, *tmp = ms.top; tmp; tmp = next)
1726 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1727 {
1728 /* Trim the search when we find the first other spell effect
1729 * this helps performance so that if a space has 50 spell objects,
1730 * we don't need to check all of them.
1731 */
1732 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1733 break;
1734 } 1810 {
1811 next = tmp->below;
1735 1812
1736 for (; tmp; tmp = tmp->below)
1737 {
1738 if (tmp == op) 1813 if (tmp == op)
1739 continue; /* Can't apply yourself */ 1814 continue; /* Can't apply yourself */
1740 1815
1741 /* Check to see if one of the movement types should be slowed down. 1816 /* Check to see if one of the movement types should be slowed down.
1742 * Second check makes sure that the movement types not being slowed 1817 * Second check makes sure that the movement types not being slowed
1747 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1822 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1748 { 1823 {
1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1824 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1825 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1751 { 1826 {
1752
1753 float
1754 diff = tmp->move_slow_penalty * fabs (op->speed); 1827 float diff = tmp->move_slow_penalty * fabs (op->speed);
1755 1828
1756 if (op->type == PLAYER) 1829 if (op->is_player ())
1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1830 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1831 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1759 diff /= 4.0; 1832 diff /= 4.0;
1760 1833
1761 op->speed_left -= diff; 1834 op->speed_left -= diff;
1762 } 1835 }
1763 } 1836 }
1796 LOG (llevError, "Present_arch called outside map.\n"); 1869 LOG (llevError, "Present_arch called outside map.\n");
1797 return NULL; 1870 return NULL;
1798 } 1871 }
1799 1872
1800 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1873 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1801 if (tmp->arch == at) 1874 if (tmp->arch->archname == at->archname)
1802 return tmp; 1875 return tmp;
1803 1876
1804 return NULL; 1877 return NULL;
1805} 1878}
1806 1879
1870 * The first matching object is returned, or NULL if none. 1943 * The first matching object is returned, or NULL if none.
1871 */ 1944 */
1872object * 1945object *
1873present_arch_in_ob (const archetype *at, const object *op) 1946present_arch_in_ob (const archetype *at, const object *op)
1874{ 1947{
1875 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1948 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1876 if (tmp->arch == at) 1949 if (tmp->arch->archname == at->archname)
1877 return tmp; 1950 return tmp;
1878 1951
1879 return NULL; 1952 return NULL;
1880} 1953}
1881 1954
1883 * activate recursively a flag on an object inventory 1956 * activate recursively a flag on an object inventory
1884 */ 1957 */
1885void 1958void
1886flag_inv (object *op, int flag) 1959flag_inv (object *op, int flag)
1887{ 1960{
1888 if (op->inv)
1889 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1961 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1890 { 1962 {
1891 SET_FLAG (tmp, flag); 1963 SET_FLAG (tmp, flag);
1892 flag_inv (tmp, flag); 1964 flag_inv (tmp, flag);
1893 } 1965 }
1894} 1966}
1895 1967
1896/* 1968/*
1897 * deactivate recursively a flag on an object inventory 1969 * deactivate recursively a flag on an object inventory
1898 */ 1970 */
1899void 1971void
1900unflag_inv (object *op, int flag) 1972unflag_inv (object *op, int flag)
1901{ 1973{
1902 if (op->inv)
1903 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1974 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1904 { 1975 {
1905 CLEAR_FLAG (tmp, flag); 1976 CLEAR_FLAG (tmp, flag);
1906 unflag_inv (tmp, flag); 1977 unflag_inv (tmp, flag);
1907 } 1978 }
1908}
1909
1910/*
1911 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1912 * all it's inventory (recursively).
1913 * If checksums are used, a player will get set_cheat called for
1914 * him/her-self and all object carried by a call to this function.
1915 */
1916void
1917set_cheat (object *op)
1918{
1919 SET_FLAG (op, FLAG_WAS_WIZ);
1920 flag_inv (op, FLAG_WAS_WIZ);
1921} 1979}
1922 1980
1923/* 1981/*
1924 * find_free_spot(object, map, x, y, start, stop) will search for 1982 * find_free_spot(object, map, x, y, start, stop) will search for
1925 * a spot at the given map and coordinates which will be able to contain 1983 * a spot at the given map and coordinates which will be able to contain
1927 * to search (see the freearr_x/y[] definition). 1985 * to search (see the freearr_x/y[] definition).
1928 * It returns a random choice among the alternatives found. 1986 * It returns a random choice among the alternatives found.
1929 * start and stop are where to start relative to the free_arr array (1,9 1987 * start and stop are where to start relative to the free_arr array (1,9
1930 * does all 4 immediate directions). This returns the index into the 1988 * does all 4 immediate directions). This returns the index into the
1931 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1989 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1932 * Note - this only checks to see if there is space for the head of the
1933 * object - if it is a multispace object, this should be called for all
1934 * pieces.
1935 * Note2: This function does correctly handle tiled maps, but does not 1990 * Note: This function does correctly handle tiled maps, but does not
1936 * inform the caller. However, insert_ob_in_map will update as 1991 * inform the caller. However, insert_ob_in_map will update as
1937 * necessary, so the caller shouldn't need to do any special work. 1992 * necessary, so the caller shouldn't need to do any special work.
1938 * Note - updated to take an object instead of archetype - this is necessary 1993 * Note - updated to take an object instead of archetype - this is necessary
1939 * because arch_blocked (now ob_blocked) needs to know the movement type 1994 * because arch_blocked (now ob_blocked) needs to know the movement type
1940 * to know if the space in question will block the object. We can't use 1995 * to know if the space in question will block the object. We can't use
1942 * customized, changed states, etc. 1997 * customized, changed states, etc.
1943 */ 1998 */
1944int 1999int
1945find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1946{ 2001{
2002 int altern[SIZEOFFREE];
1947 int index = 0, flag; 2003 int index = 0, flag;
1948 int altern[SIZEOFFREE];
1949 2004
1950 for (int i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
1951 { 2006 {
1952 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 mapxy pos (m, x, y); pos.move (i);
1953 if (!flag) 2008
2009 if (!pos.normalise ())
2010 continue;
2011
2012 mapspace &ms = *pos;
2013
2014 if (ms.flags () & P_IS_ALIVE)
2015 continue;
2016
2017 /* However, often
2018 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */
2021 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 {
1954 altern [index++] = i; 2023 altern [index++] = i;
2024 continue;
2025 }
1955 2026
1956 /* Basically, if we find a wall on a space, we cut down the search size. 2027 /* Basically, if we find a wall on a space, we cut down the search size.
1957 * In this way, we won't return spaces that are on another side of a wall. 2028 * In this way, we won't return spaces that are on another side of a wall.
1958 * This mostly work, but it cuts down the search size in all directions - 2029 * This mostly work, but it cuts down the search size in all directions -
1959 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
1960 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
1961 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
1962 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
1963 */ 2034 */
1964 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2035 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2036 {
1965 stop = maxfree[i]; 2037 stop = maxfree[i];
2038 continue;
2039 }
2040
2041 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object.
2043 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2045 continue;
2046
2047 if (ob->blocked (pos.m, pos.x, pos.y))
2048 continue;
2049
2050 altern [index++] = i;
1966 } 2051 }
1967 2052
1968 if (!index) 2053 if (!index)
1969 return -1; 2054 return -1;
1970 2055
1971 return altern[RANDOM () % index]; 2056 return altern [rndm (index)];
1972} 2057}
1973 2058
1974/* 2059/*
1975 * find_first_free_spot(archetype, maptile, x, y) works like 2060 * find_first_free_spot(archetype, maptile, x, y) works like
1976 * find_free_spot(), but it will search max number of squares. 2061 * find_free_spot(), but it will search max number of squares.
1979 */ 2064 */
1980int 2065int
1981find_first_free_spot (const object *ob, maptile *m, int x, int y) 2066find_first_free_spot (const object *ob, maptile *m, int x, int y)
1982{ 2067{
1983 for (int i = 0; i < SIZEOFFREE; i++) 2068 for (int i = 0; i < SIZEOFFREE; i++)
1984 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2069 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
1985 return i; 2070 return i;
1986 2071
1987 return -1; 2072 return -1;
1988} 2073}
1989 2074
1997{ 2082{
1998 arr += begin; 2083 arr += begin;
1999 end -= begin; 2084 end -= begin;
2000 2085
2001 while (--end) 2086 while (--end)
2002 swap (arr [end], arr [RANDOM () % (end + 1)]); 2087 swap (arr [end], arr [rndm (end + 1)]);
2003} 2088}
2004 2089
2005/* new function to make monster searching more efficient, and effective! 2090/* new function to make monster searching more efficient, and effective!
2006 * This basically returns a randomized array (in the passed pointer) of 2091 * This basically returns a randomized array (in the passed pointer) of
2007 * the spaces to find monsters. In this way, it won't always look for 2092 * the spaces to find monsters. In this way, it won't always look for
2035 * there is capable of. 2120 * there is capable of.
2036 */ 2121 */
2037int 2122int
2038find_dir (maptile *m, int x, int y, object *exclude) 2123find_dir (maptile *m, int x, int y, object *exclude)
2039{ 2124{
2040 int i, max = SIZEOFFREE, mflags; 2125 int max = SIZEOFFREE, mflags;
2041
2042 sint16 nx, ny;
2043 object *tmp;
2044 maptile *mp;
2045
2046 MoveType blocked, move_type; 2126 MoveType move_type;
2047 2127
2048 if (exclude && exclude->head) 2128 if (exclude && exclude->head_ () != exclude)
2049 { 2129 {
2050 exclude = exclude->head; 2130 exclude = exclude->head;
2051 move_type = exclude->move_type; 2131 move_type = exclude->move_type;
2052 } 2132 }
2053 else 2133 else
2054 { 2134 {
2055 /* If we don't have anything, presume it can use all movement types. */ 2135 /* If we don't have anything, presume it can use all movement types. */
2056 move_type = MOVE_ALL; 2136 move_type = MOVE_ALL;
2057 } 2137 }
2058 2138
2059 for (i = 1; i < max; i++) 2139 for (int i = 1; i < max; i++)
2060 { 2140 {
2061 mp = m; 2141 mapxy pos (m, x, y);
2062 nx = x + freearr_x[i]; 2142 pos.move (i);
2063 ny = y + freearr_y[i];
2064 2143
2065 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2144 if (!pos.normalise ())
2066
2067 if (mflags & P_OUT_OF_MAP)
2068 max = maxfree[i]; 2145 max = maxfree[i];
2069 else 2146 else
2070 { 2147 {
2071 mapspace &ms = mp->at (nx, ny); 2148 mapspace &ms = *pos;
2072 2149
2073 blocked = ms.move_block;
2074
2075 if ((move_type & blocked) == move_type) 2150 if ((move_type & ms.move_block) == move_type)
2076 max = maxfree[i]; 2151 max = maxfree [i];
2077 else if (mflags & P_IS_ALIVE) 2152 else if (ms.flags () & P_IS_ALIVE)
2078 { 2153 {
2079 for (tmp = ms.bot; tmp; tmp = tmp->above) 2154 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2080 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2155 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2081 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2156 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2082 break;
2083
2084 if (tmp)
2085 return freedir[i]; 2157 return freedir [i];
2086 } 2158 }
2087 } 2159 }
2088 } 2160 }
2089 2161
2090 return 0; 2162 return 0;
2165 * This basically means that if direction is 15, then it could either go 2237 * This basically means that if direction is 15, then it could either go
2166 * direction 4, 14, or 16 to get back to where we are. 2238 * direction 4, 14, or 16 to get back to where we are.
2167 * Moved from spell_util.c to object.c with the other related direction 2239 * Moved from spell_util.c to object.c with the other related direction
2168 * functions. 2240 * functions.
2169 */ 2241 */
2170int reduction_dir[SIZEOFFREE][3] = { 2242static const int reduction_dir[SIZEOFFREE][3] = {
2171 {0, 0, 0}, /* 0 */ 2243 {0, 0, 0}, /* 0 */
2172 {0, 0, 0}, /* 1 */ 2244 {0, 0, 0}, /* 1 */
2173 {0, 0, 0}, /* 2 */ 2245 {0, 0, 0}, /* 2 */
2174 {0, 0, 0}, /* 3 */ 2246 {0, 0, 0}, /* 3 */
2175 {0, 0, 0}, /* 4 */ 2247 {0, 0, 0}, /* 4 */
2266 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2338 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2267 * core dumps if they do. 2339 * core dumps if they do.
2268 * 2340 *
2269 * Add a check so we can't pick up invisible objects (0.93.8) 2341 * Add a check so we can't pick up invisible objects (0.93.8)
2270 */ 2342 */
2271
2272int 2343int
2273can_pick (const object *who, const object *item) 2344can_pick (const object *who, const object *item)
2274{ 2345{
2275 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2346 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2276 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2347 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2277 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2348 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2278} 2349}
2279 2350
2280/* 2351/*
2281 * create clone from object to another 2352 * create clone from object to another
2282 */ 2353 */
2283object * 2354object *
2284object_create_clone (object *asrc) 2355object::deep_clone ()
2285{ 2356{
2286 object *dst = 0, *tmp, *src, *part, *prev, *item; 2357 assert (("deep_clone called on non-head object", is_head ()));
2287 2358
2288 if (!asrc) 2359 object *dst = clone ();
2289 return 0;
2290 2360
2291 src = asrc; 2361 object *prev = dst;
2292 if (src->head)
2293 src = src->head;
2294
2295 prev = 0;
2296 for (part = src; part; part = part->more) 2362 for (object *part = this->more; part; part = part->more)
2297 { 2363 {
2298 tmp = part->clone (); 2364 object *tmp = part->clone ();
2299 tmp->x -= src->x;
2300 tmp->y -= src->y;
2301
2302 if (!part->head)
2303 {
2304 dst = tmp;
2305 tmp->head = 0;
2306 }
2307 else
2308 tmp->head = dst; 2365 tmp->head = dst;
2309
2310 tmp->more = 0;
2311
2312 if (prev)
2313 prev->more = tmp; 2366 prev->more = tmp;
2314
2315 prev = tmp; 2367 prev = tmp;
2316 } 2368 }
2317 2369
2318 for (item = src->inv; item; item = item->below) 2370 for (object *item = inv; item; item = item->below)
2319 insert_ob_in_ob (object_create_clone (item), dst); 2371 insert_ob_in_ob (item->deep_clone (), dst);
2320 2372
2321 return dst; 2373 return dst;
2322}
2323
2324/* GROS - Creates an object using a string representing its content. */
2325/* Basically, we save the content of the string to a temp file, then call */
2326/* load_object on it. I admit it is a highly inefficient way to make things, */
2327/* but it was simple to make and allows reusing the load_object function. */
2328/* Remember not to use load_object_str in a time-critical situation. */
2329/* Also remember that multiparts objects are not supported for now. */
2330object *
2331load_object_str (const char *obstr)
2332{
2333 object *op;
2334 char filename[MAX_BUF];
2335
2336 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2337
2338 FILE *tempfile = fopen (filename, "w");
2339
2340 if (tempfile == NULL)
2341 {
2342 LOG (llevError, "Error - Unable to access load object temp file\n");
2343 return NULL;
2344 }
2345
2346 fprintf (tempfile, obstr);
2347 fclose (tempfile);
2348
2349 op = object::create ();
2350
2351 object_thawer thawer (filename);
2352
2353 if (thawer)
2354 load_object (thawer, op, 0);
2355
2356 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2357 CLEAR_FLAG (op, FLAG_REMOVED);
2358
2359 return op;
2360} 2374}
2361 2375
2362/* This returns the first object in who's inventory that 2376/* This returns the first object in who's inventory that
2363 * has the same type and subtype match. 2377 * has the same type and subtype match.
2364 * returns NULL if no match. 2378 * returns NULL if no match.
2371 return tmp; 2385 return tmp;
2372 2386
2373 return 0; 2387 return 0;
2374} 2388}
2375 2389
2376/* If ob has a field named key, return the link from the list, 2390shstr_tmp
2377 * otherwise return NULL. 2391object::kv_get (shstr_tmp key) const
2378 *
2379 * key must be a passed in shared string - otherwise, this won't
2380 * do the desired thing.
2381 */
2382key_value *
2383get_ob_key_link (const object *ob, const char *key)
2384{ 2392{
2385 for (key_value *link = ob->key_values; link; link = link->next) 2393 for (key_value *kv = key_values; kv; kv = kv->next)
2386 if (link->key == key) 2394 if (kv->key == key)
2387 return link;
2388
2389 return 0;
2390}
2391
2392/*
2393 * Returns the value of op has an extra_field for key, or NULL.
2394 *
2395 * The argument doesn't need to be a shared string.
2396 *
2397 * The returned string is shared.
2398 */
2399const char *
2400get_ob_key_value (const object *op, const char *const key)
2401{
2402 key_value *link;
2403 shstr_cmp canonical_key (key);
2404
2405 if (!canonical_key)
2406 {
2407 /* 1. There being a field named key on any object
2408 * implies there'd be a shared string to find.
2409 * 2. Since there isn't, no object has this field.
2410 * 3. Therefore, *this* object doesn't have this field.
2411 */
2412 return 0;
2413 }
2414
2415 /* This is copied from get_ob_key_link() above -
2416 * only 4 lines, and saves the function call overhead.
2417 */
2418 for (link = op->key_values; link; link = link->next)
2419 if (link->key == canonical_key)
2420 return link->value; 2395 return kv->value;
2421 2396
2422 return 0; 2397 return shstr ();
2423} 2398}
2424 2399
2425 2400void
2426/* 2401object::kv_set (shstr_tmp key, shstr_tmp value)
2427 * Updates the canonical_key in op to value.
2428 *
2429 * canonical_key is a shared string (value doesn't have to be).
2430 *
2431 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2432 * keys.
2433 *
2434 * Returns TRUE on success.
2435 */
2436int
2437set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2438{ 2402{
2439 key_value *field = NULL, *last = NULL; 2403 for (key_value *kv = key_values; kv; kv = kv->next)
2440 2404 if (kv->key == key)
2441 for (field = op->key_values; field != NULL; field = field->next)
2442 {
2443 if (field->key != canonical_key)
2444 { 2405 {
2445 last = field; 2406 kv->value = value;
2446 continue; 2407 return;
2447 } 2408 }
2448 2409
2449 if (value) 2410 key_value *kv = new key_value;
2450 field->value = value; 2411
2451 else 2412 kv->next = key_values;
2413 kv->key = key;
2414 kv->value = value;
2415
2416 key_values = kv;
2417}
2418
2419void
2420object::kv_del (shstr_tmp key)
2421{
2422 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2423 if ((*kvp)->key == key)
2452 { 2424 {
2453 /* Basically, if the archetype has this key set, 2425 key_value *kv = *kvp;
2454 * we need to store the null value so when we save 2426 *kvp = (*kvp)->next;
2455 * it, we save the empty value so that when we load, 2427 delete kv;
2456 * we get this value back again. 2428 return;
2457 */
2458 if (get_ob_key_link (&op->arch->clone, canonical_key))
2459 field->value = 0;
2460 else
2461 {
2462 if (last)
2463 last->next = field->next;
2464 else
2465 op->key_values = field->next;
2466
2467 delete field;
2468 }
2469 } 2429 }
2470 return TRUE;
2471 }
2472 /* IF we get here, key doesn't exist */
2473
2474 /* No field, we'll have to add it. */
2475
2476 if (!add_key)
2477 return FALSE;
2478
2479 /* There isn't any good reason to store a null
2480 * value in the key/value list. If the archetype has
2481 * this key, then we should also have it, so shouldn't
2482 * be here. If user wants to store empty strings,
2483 * should pass in ""
2484 */
2485 if (value == NULL)
2486 return TRUE;
2487
2488 field = new key_value;
2489
2490 field->key = canonical_key;
2491 field->value = value;
2492 /* Usual prepend-addition. */
2493 field->next = op->key_values;
2494 op->key_values = field;
2495
2496 return TRUE;
2497}
2498
2499/*
2500 * Updates the key in op to value.
2501 *
2502 * If add_key is FALSE, this will only update existing keys,
2503 * and not add new ones.
2504 * In general, should be little reason FALSE is ever passed in for add_key
2505 *
2506 * Returns TRUE on success.
2507 */
2508int
2509set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2510{
2511 shstr key_ (key);
2512
2513 return set_ob_key_value_s (op, key_, value, add_key);
2514} 2430}
2515 2431
2516object::depth_iterator::depth_iterator (object *container) 2432object::depth_iterator::depth_iterator (object *container)
2517: iterator_base (container) 2433: iterator_base (container)
2518{ 2434{
2531 item = item->inv; 2447 item = item->inv;
2532 } 2448 }
2533 else 2449 else
2534 item = item->env; 2450 item = item->env;
2535} 2451}
2536
2537 2452
2538const char * 2453const char *
2539object::flag_desc (char *desc, int len) const 2454object::flag_desc (char *desc, int len) const
2540{ 2455{
2541 char *p = desc; 2456 char *p = desc;
2569{ 2484{
2570 char flagdesc[512]; 2485 char flagdesc[512];
2571 char info2[256 * 4]; 2486 char info2[256 * 4];
2572 char *p = info; 2487 char *p = info;
2573 2488
2574 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2489 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2575 count, uuid.seq, 2490 count,
2491 uuid.c_str (),
2576 &name, 2492 &name,
2577 title ? "\",title:\"" : "", 2493 title ? ",title:\"" : "",
2578 title ? (const char *)title : "", 2494 title ? (const char *)title : "",
2495 title ? "\"" : "",
2579 flag_desc (flagdesc, 512), type); 2496 flag_desc (flagdesc, 512), type);
2580 2497
2581 if (env) 2498 if (!flag[FLAG_REMOVED] && env)
2582 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2499 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2583 2500
2584 if (map) 2501 if (map)
2585 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2502 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2586 2503
2588} 2505}
2589 2506
2590const char * 2507const char *
2591object::debug_desc () const 2508object::debug_desc () const
2592{ 2509{
2593 static char info[256 * 4]; 2510 static char info[3][256 * 4];
2511 static int info_idx;
2512
2594 return debug_desc (info); 2513 return debug_desc (info [++info_idx % 3]);
2595} 2514}
2596 2515
2597const char * 2516struct region *
2598object::debug_desc2 () const 2517object::region () const
2599{ 2518{
2600 static char info[256 * 4]; 2519 return map ? map->region (x, y)
2601 return debug_desc (info); 2520 : region::default_region ();
2602} 2521}
2603 2522
2523void
2524object::open_container (object *new_container)
2525{
2526 if (container == new_container)
2527 return;
2528
2529 object *old_container = container;
2530
2531 if (old_container)
2532 {
2533 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2534 return;
2535
2536#if 0
2537 // remove the "Close old_container" object.
2538 if (object *closer = old_container->inv)
2539 if (closer->type == CLOSE_CON)
2540 closer->destroy ();
2541#endif
2542
2543 // make sure the container is available
2544 esrv_send_item (this, old_container);
2545
2546 old_container->flag [FLAG_APPLIED] = false;
2547 container = 0;
2548
2549 // client needs item update to make it work, client bug requires this to be separate
2550 esrv_update_item (UPD_FLAGS, this, old_container);
2551
2552 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2553 play_sound (sound_find ("chest_close"));
2554 }
2555
2556 if (new_container)
2557 {
2558 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2559 return;
2560
2561 // TODO: this does not seem to serve any purpose anymore?
2562#if 0
2563 // insert the "Close Container" object.
2564 if (archetype *closer = new_container->other_arch)
2565 {
2566 object *closer = arch_to_object (new_container->other_arch);
2567 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2568 new_container->insert (closer);
2569 }
2570#endif
2571
2572 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2573
2574 // make sure the container is available, client bug requires this to be separate
2575 esrv_send_item (this, new_container);
2576
2577 new_container->flag [FLAG_APPLIED] = true;
2578 container = new_container;
2579
2580 // client needs flag change
2581 esrv_update_item (UPD_FLAGS, this, new_container);
2582 esrv_send_inventory (this, new_container);
2583 play_sound (sound_find ("chest_open"));
2584 }
2585// else if (!old_container->env && contr && contr->ns)
2586// contr->ns->floorbox_reset ();
2587}
2588
2589object *
2590object::force_find (shstr_tmp name)
2591{
2592 /* cycle through his inventory to look for the MARK we want to
2593 * place
2594 */
2595 for (object *tmp = inv; tmp; tmp = tmp->below)
2596 if (tmp->type == FORCE && tmp->slaying == name)
2597 return splay (tmp);
2598
2599 return 0;
2600}
2601
2602//-GPL
2603
2604void
2605object::force_set_timer (int duration)
2606{
2607 this->duration = 1;
2608 this->speed_left = -1.f;
2609
2610 this->set_speed (duration ? 1.f / duration : 0.f);
2611}
2612
2613object *
2614object::force_add (shstr_tmp name, int duration)
2615{
2616 if (object *force = force_find (name))
2617 force->destroy ();
2618
2619 object *force = get_archetype (FORCE_NAME);
2620
2621 force->slaying = name;
2622 force->force_set_timer (duration);
2623 force->flag [FLAG_APPLIED] = true;
2624
2625 return insert (force);
2626}
2627
2628void
2629object::play_sound (faceidx sound) const
2630{
2631 if (!sound)
2632 return;
2633
2634 if (is_on_map ())
2635 map->play_sound (sound, x, y);
2636 else if (object *pl = in_player ())
2637 pl->contr->play_sound (sound);
2638}
2639
2640void
2641object::say_msg (const char *msg) const
2642{
2643 if (is_on_map ())
2644 map->say_msg (msg, x, y);
2645 else if (object *pl = in_player ())
2646 pl->contr->play_sound (sound);
2647}
2648
2649void
2650object::make_noise ()
2651{
2652 // we do not model noise in the map, so instead put
2653 // a temporary light into the noise source
2654 // could use the map instead, but that's less reliable for our
2655 // goal, which is to make invisibility a bit harder to exploit
2656
2657 // currently only works sensibly for players
2658 if (!is_player ())
2659 return;
2660
2661 // find old force, or create new one
2662 object *force = force_find (shstr_noise_force);
2663
2664 if (force)
2665 force->speed_left = -1.f; // patch old speed up
2666 else
2667 {
2668 force = archetype::get (shstr_noise_force);
2669
2670 force->slaying = shstr_noise_force;
2671 force->stats.food = 1;
2672 force->speed_left = -1.f;
2673
2674 force->set_speed (1.f / 4.f);
2675 force->flag [FLAG_IS_USED_UP] = true;
2676 force->flag [FLAG_APPLIED] = true;
2677
2678 insert (force);
2679 }
2680}
2681

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines