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.15 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.142 by root, Mon Apr 30 04:25:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines