ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.16 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines