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.16 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines