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.148 by root, Mon May 14 19:08:25 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines