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.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines