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.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.115 by root, Mon Jan 15 01:39:42 2007 UTC

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