1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * 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 |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * 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, |
… | |
… | |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * 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 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
25 | sub/add_weight will transcend the environment updating the carrying |
|
|
26 | variable. */ |
|
|
27 | #include <global.h> |
24 | #include <global.h> |
28 | #include <stdio.h> |
25 | #include <stdio.h> |
29 | #include <sys/types.h> |
26 | #include <sys/types.h> |
30 | #include <sys/uio.h> |
27 | #include <sys/uio.h> |
31 | #include <object.h> |
28 | #include <object.h> |
32 | #include <funcpoint.h> |
|
|
33 | #include <sproto.h> |
29 | #include <sproto.h> |
34 | #include <loader.h> |
30 | #include <loader.h> |
35 | |
31 | |
36 | #include <bitset> |
32 | #include <bitset> |
37 | |
33 | |
38 | int nrofallocobjects = 0; |
34 | UUID UUID::cur; |
39 | static UUID uuid; |
35 | static uint64_t seq_next_save; |
40 | const uint64 UUID_SKIP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
41 | |
37 | |
42 | objectvec objects; |
38 | objectvec objects; |
43 | activevec actives; |
39 | activevec actives; |
44 | |
40 | |
45 | short 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, |
41 | short freearr_x[SIZEOFFREE] = { |
|
|
42 | 0, |
|
|
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
|
|
44 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
46 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | 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 | }; |
46 | }; |
48 | short 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, |
47 | short freearr_y[SIZEOFFREE] = { |
|
|
48 | 0, |
|
|
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
|
|
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
49 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
51 | -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 | }; |
52 | }; |
51 | int 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, |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
52 | 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
57 | 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 | }; |
58 | }; |
54 | int freedir[SIZEOFFREE] = { |
59 | int freedir[SIZEOFFREE] = { |
55 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
60 | 0, |
|
|
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
|
|
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
56 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
63 | 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 | }; |
64 | }; |
58 | |
65 | |
59 | static void |
66 | static void |
60 | write_uuid (void) |
67 | write_uuid (uval64 skip, bool sync) |
61 | { |
68 | { |
62 | char filename1[MAX_BUF], filename2[MAX_BUF]; |
69 | CALL_BEGIN (2); |
63 | |
70 | CALL_ARG_SV (newSVval64 (skip)); |
64 | sprintf (filename1, "%s/uuid", settings.localdir); |
71 | CALL_ARG_SV (boolSV (sync)); |
65 | sprintf (filename2, "%s/uuid~", settings.localdir); |
72 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
66 | |
73 | CALL_END; |
67 | FILE *fp; |
|
|
68 | |
|
|
69 | if (!(fp = fopen (filename2, "w"))) |
|
|
70 | { |
|
|
71 | LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); |
|
|
72 | return; |
|
|
73 | } |
|
|
74 | |
|
|
75 | fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); |
|
|
76 | fclose (fp); |
|
|
77 | rename (filename2, filename1); |
|
|
78 | } |
74 | } |
79 | |
75 | |
80 | static void |
76 | static void |
81 | read_uuid (void) |
77 | read_uuid (void) |
82 | { |
78 | { |
83 | char filename[MAX_BUF]; |
79 | char filename[MAX_BUF]; |
84 | |
80 | |
85 | sprintf (filename, "%s/uuid", settings.localdir); |
81 | sprintf (filename, "%s/uuid", settings.localdir); |
|
|
82 | |
|
|
83 | seq_next_save = 0; |
86 | |
84 | |
87 | FILE *fp; |
85 | FILE *fp; |
88 | |
86 | |
89 | if (!(fp = fopen (filename, "r"))) |
87 | if (!(fp = fopen (filename, "r"))) |
90 | { |
88 | { |
91 | if (errno == ENOENT) |
89 | if (errno == ENOENT) |
92 | { |
90 | { |
93 | LOG (llevInfo, "RESET uid to 1\n"); |
91 | LOG (llevInfo, "RESET uid to 1\n"); |
94 | uuid.seq = 0; |
92 | UUID::cur.seq = 0; |
95 | write_uuid (); |
93 | write_uuid (UUID_GAP, true); |
96 | return; |
94 | return; |
97 | } |
95 | } |
98 | |
96 | |
99 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
97 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
100 | _exit (1); |
98 | _exit (1); |
101 | } |
99 | } |
102 | |
100 | |
103 | int version; |
101 | UUID::BUF buf; |
104 | unsigned long long uid; |
102 | buf[0] = 0; |
105 | if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) |
103 | fgets (buf, sizeof (buf), fp); |
|
|
104 | |
|
|
105 | if (!UUID::cur.parse (buf)) |
106 | { |
106 | { |
107 | LOG (llevError, "FATAL: error reading uid from %s!\n", filename); |
107 | LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf); |
108 | _exit (1); |
108 | _exit (1); |
109 | } |
109 | } |
110 | |
110 | |
111 | uuid.seq = uid; |
111 | LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ()); |
112 | write_uuid (); |
112 | |
113 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
113 | write_uuid (UUID_GAP, true); |
114 | fclose (fp); |
114 | fclose (fp); |
115 | } |
115 | } |
116 | |
116 | |
117 | UUID |
117 | UUID |
118 | gen_uuid () |
118 | UUID::gen () |
119 | { |
119 | { |
120 | UUID uid; |
120 | UUID uid; |
121 | |
121 | |
122 | uid.seq = ++uuid.seq; |
122 | uid.seq = ++cur.seq; |
123 | |
123 | |
124 | if (!(uuid.seq & (UUID_SKIP - 1))) |
124 | if (expect_false (cur.seq >= seq_next_save)) |
125 | write_uuid (); |
125 | { |
|
|
126 | seq_next_save = UUID::cur.seq + (UUID_GAP >> 1); |
|
|
127 | write_uuid (UUID_GAP, false); |
|
|
128 | } |
|
|
129 | |
126 | |
130 | |
127 | return uid; |
131 | return uid; |
128 | } |
132 | } |
129 | |
133 | |
130 | void |
134 | void |
131 | init_uuid () |
135 | UUID::init () |
132 | { |
136 | { |
133 | read_uuid (); |
137 | read_uuid (); |
134 | } |
138 | } |
135 | |
139 | |
136 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
137 | static int |
141 | static bool |
138 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
139 | { |
143 | { |
140 | key_value *wants_field; |
|
|
141 | |
|
|
142 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
143 | * objects with lists are rare, and lists stay short. If not, use a |
145 | * objects with lists are rare, and lists stay short. If not, use a |
144 | * different structure or at least keep the lists sorted... |
146 | * different structure or at least keep the lists sorted... |
145 | */ |
147 | */ |
146 | |
148 | |
147 | /* For each field in wants, */ |
149 | /* For each field in wants, */ |
148 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
149 | { |
151 | if (has->kv_get (kv->key) != kv->value) |
150 | key_value *has_field; |
152 | return false; |
151 | |
|
|
152 | /* Look for a field in has with the same key. */ |
|
|
153 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
154 | |
|
|
155 | if (has_field == NULL) |
|
|
156 | { |
|
|
157 | /* No field with that name. */ |
|
|
158 | return FALSE; |
|
|
159 | } |
|
|
160 | |
|
|
161 | /* Found the matching field. */ |
|
|
162 | if (has_field->value != wants_field->value) |
|
|
163 | { |
|
|
164 | /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | return FALSE; |
|
|
166 | } |
|
|
167 | |
|
|
168 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
169 | } |
|
|
170 | |
153 | |
171 | /* If we get here, every field in wants has a matching field in has. */ |
154 | /* If we get here, every field in wants has a matching field in has. */ |
172 | return TRUE; |
155 | return true; |
173 | } |
156 | } |
174 | |
157 | |
175 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
158 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
176 | static int |
159 | static bool |
177 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_ob_value_lists (const object *ob1, const object *ob2) |
178 | { |
161 | { |
179 | /* However, there may be fields in has which aren't partnered in wants, |
162 | /* However, there may be fields in has which aren't partnered in wants, |
180 | * so we need to run the comparison *twice*. :( |
163 | * so we need to run the comparison *twice*. :( |
181 | */ |
164 | */ |
182 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
165 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
166 | && compare_ob_value_lists_one (ob2, ob1); |
183 | } |
167 | } |
184 | |
168 | |
185 | /* Function examines the 2 objects given to it, and returns true if |
169 | /* Function examines the 2 objects given to it, and returns true if |
186 | * they can be merged together. |
170 | * they can be merged together. |
187 | * |
171 | * |
… | |
… | |
202 | || ob1->speed != ob2->speed |
186 | || ob1->speed != ob2->speed |
203 | || ob1->value != ob2->value |
187 | || ob1->value != ob2->value |
204 | || ob1->name != ob2->name) |
188 | || ob1->name != ob2->name) |
205 | return 0; |
189 | return 0; |
206 | |
190 | |
207 | //TODO: this ain't working well, use nicer and correct overflow check |
|
|
208 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
191 | /* Do not merge objects if nrof would overflow, assume nrof |
209 | * value could not be stored in a sint32 (which unfortunately sometimes is |
192 | * is always 0 .. 2**31-1 */ |
210 | * used to store nrof). |
193 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
211 | */ |
|
|
212 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
|
|
213 | return 0; |
194 | return 0; |
214 | |
195 | |
215 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
196 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
216 | * This is to the comparison of the flags below will be OK. We |
197 | * This is to the comparison of the flags below will be OK. We |
217 | * just can't ignore the been applied or identified flags, as they |
198 | * just can't ignore the been applied or identified flags, as they |
218 | * are not equal - just if it has been identified, the been_applied |
199 | * are not equal - just if it has been identified, the been_applied |
219 | * flags lose any meaning. |
200 | * flags lose any meaning. |
220 | */ |
201 | */ |
221 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
202 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
222 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
203 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
223 | |
204 | |
224 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
205 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
225 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
226 | |
207 | |
227 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
208 | if (ob1->arch->archname != ob2->arch->archname |
228 | || ob1->arch != ob2->arch |
|
|
229 | || ob1->name != ob2->name |
209 | || ob1->name != ob2->name |
230 | || ob1->title != ob2->title |
210 | || ob1->title != ob2->title |
231 | || ob1->msg != ob2->msg |
211 | || ob1->msg != ob2->msg |
232 | || ob1->weight != ob2->weight |
212 | || ob1->weight != ob2->weight |
233 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
|
|
235 | || ob1->attacktype != ob2->attacktype |
213 | || ob1->attacktype != ob2->attacktype |
236 | || ob1->magic != ob2->magic |
214 | || ob1->magic != ob2->magic |
237 | || ob1->slaying != ob2->slaying |
215 | || ob1->slaying != ob2->slaying |
238 | || ob1->skill != ob2->skill |
216 | || ob1->skill != ob2->skill |
239 | || ob1->value != ob2->value |
217 | || ob1->value != ob2->value |
240 | || ob1->animation_id != ob2->animation_id |
218 | || ob1->animation_id != ob2->animation_id |
|
|
219 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
241 | || ob1->client_type != ob2->client_type |
220 | || ob1->client_type != ob2->client_type |
242 | || ob1->materialname != ob2->materialname |
221 | || ob1->materialname != ob2->materialname |
243 | || ob1->lore != ob2->lore |
222 | || ob1->lore != ob2->lore |
244 | || ob1->subtype != ob2->subtype |
223 | || ob1->subtype != ob2->subtype |
245 | || ob1->move_type != ob2->move_type |
224 | || ob1->move_type != ob2->move_type |
246 | || ob1->move_block != ob2->move_block |
225 | || ob1->move_block != ob2->move_block |
247 | || ob1->move_allow != ob2->move_allow |
226 | || ob1->move_allow != ob2->move_allow |
248 | || ob1->move_on != ob2->move_on |
227 | || ob1->move_on != ob2->move_on |
249 | || ob1->move_off != ob2->move_off |
228 | || ob1->move_off != ob2->move_off |
250 | || ob1->move_slow != ob2->move_slow |
229 | || ob1->move_slow != ob2->move_slow |
251 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
230 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
|
|
231 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
252 | return 0; |
233 | return 0; |
253 | |
234 | |
|
|
235 | if ((ob1->flag ^ ob2->flag) |
|
|
236 | .reset (FLAG_INV_LOCKED) |
|
|
237 | .reset (FLAG_REMOVED) |
|
|
238 | .any ()) |
|
|
239 | return 0; |
|
|
240 | |
254 | /* This is really a spellbook check - really, we should |
241 | /* This is really a spellbook check - we should in general |
255 | * check all objects in the inventory. |
242 | * not merge objects with real inventories, as splitting them |
|
|
243 | * is hard. |
256 | */ |
244 | */ |
257 | if (ob1->inv || ob2->inv) |
245 | if (ob1->inv || ob2->inv) |
258 | { |
246 | { |
259 | /* if one object has inventory but the other doesn't, not equiv */ |
247 | if (!(ob1->inv && ob2->inv)) |
260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
248 | return 0; /* inventories differ in length */ |
261 | return 0; |
|
|
262 | |
249 | |
263 | /* Now check to see if the two inventory objects could merge */ |
250 | if (ob1->inv->below || ob2->inv->below) |
|
|
251 | return 0; /* more than one object in inv */ |
|
|
252 | |
264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
253 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | return 0; |
254 | return 0; /* inventory objects differ */ |
266 | |
255 | |
267 | /* inventory ok - still need to check rest of this object to see |
256 | /* inventory ok - still need to check rest of this object to see |
268 | * if it is valid. |
257 | * if it is valid. |
269 | */ |
258 | */ |
270 | } |
259 | } |
… | |
… | |
289 | if (ob1->level != ob2->level) |
278 | if (ob1->level != ob2->level) |
290 | return 0; |
279 | return 0; |
291 | break; |
280 | break; |
292 | } |
281 | } |
293 | |
282 | |
294 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
283 | if (ob1->key_values || ob2->key_values) |
295 | { |
284 | { |
296 | /* At least one of these has key_values. */ |
285 | /* At least one of these has key_values. */ |
297 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) |
286 | if ((!ob1->key_values) != (!ob2->key_values)) |
298 | /* One has fields, but the other one doesn't. */ |
287 | return 0; /* One has fields, but the other one doesn't. */ |
299 | return 0; |
288 | |
300 | else if (!compare_ob_value_lists (ob1, ob2)) |
289 | if (!compare_ob_value_lists (ob1, ob2)) |
301 | return 0; |
290 | return 0; |
302 | } |
291 | } |
303 | |
292 | |
304 | if (ob1->self || ob2->self) |
293 | if (ob1->self || ob2->self) |
305 | { |
294 | { |
306 | ob1->optimise (); |
295 | ob1->optimise (); |
307 | ob2->optimise (); |
296 | ob2->optimise (); |
308 | |
297 | |
309 | if (ob1->self || ob2->self) |
298 | if (ob1->self || ob2->self) |
|
|
299 | { |
|
|
300 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
301 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
302 | |
|
|
303 | if (k1 != k2) |
|
|
304 | return 0; |
|
|
305 | |
|
|
306 | if (k1 == 0) |
|
|
307 | return 1; |
|
|
308 | |
310 | if (!cfperl_can_merge (ob1, ob2)) |
309 | if (!cfperl_can_merge (ob1, ob2)) |
311 | return 0; |
310 | return 0; |
|
|
311 | } |
312 | } |
312 | } |
313 | |
313 | |
314 | /* Everything passes, must be OK. */ |
314 | /* Everything passes, must be OK. */ |
315 | return 1; |
315 | return 1; |
316 | } |
316 | } |
317 | |
317 | |
|
|
318 | // find player who can see this object |
|
|
319 | object * |
|
|
320 | object::visible_to () const |
|
|
321 | { |
|
|
322 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
323 | { |
|
|
324 | // see if we are in a container of sorts |
|
|
325 | if (env) |
|
|
326 | { |
|
|
327 | // the player inventory itself is always visible |
|
|
328 | if (env->type == PLAYER) |
|
|
329 | return env; |
|
|
330 | |
|
|
331 | // else a player could have our env open |
|
|
332 | object *envest = env->outer_env (); |
|
|
333 | |
|
|
334 | // the player itself is always on a map, so we will find him here |
|
|
335 | // even if our inv is in a player. |
|
|
336 | if (envest->is_on_map ()) |
|
|
337 | if (object *pl = envest->ms ().player ()) |
|
|
338 | if (pl->container == env) |
|
|
339 | return pl; |
|
|
340 | } |
|
|
341 | else |
|
|
342 | { |
|
|
343 | // maybe there is a player standing on the same mapspace |
|
|
344 | // this will catch the case where "this" is a player |
|
|
345 | if (object *pl = ms ().player ()) |
|
|
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
|
|
347 | || this == pl->container) |
|
|
348 | return pl; |
|
|
349 | } |
|
|
350 | } |
|
|
351 | |
|
|
352 | return 0; |
|
|
353 | } |
|
|
354 | |
|
|
355 | // adjust weight per container type ("of holding") |
|
|
356 | static sint32 |
|
|
357 | weight_adjust_for (object *op, sint32 weight) |
|
|
358 | { |
|
|
359 | return op->type == CONTAINER |
|
|
360 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
|
|
361 | : weight; |
|
|
362 | } |
|
|
363 | |
318 | /* |
364 | /* |
|
|
365 | * adjust_weight(object, weight) adds the specified weight to an object, |
|
|
366 | * and also updates how much the environment(s) is/are carrying. |
|
|
367 | */ |
|
|
368 | static void |
|
|
369 | adjust_weight (object *op, sint32 weight) |
|
|
370 | { |
|
|
371 | while (op) |
|
|
372 | { |
|
|
373 | // adjust by actual difference to account for rounding errors |
|
|
374 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
|
|
375 | weight = weight_adjust_for (op, op->carrying) |
|
|
376 | - weight_adjust_for (op, op->carrying - weight); |
|
|
377 | |
|
|
378 | if (!weight) |
|
|
379 | return; |
|
|
380 | |
|
|
381 | op->carrying += weight; |
|
|
382 | |
|
|
383 | if (object *pl = op->visible_to ()) |
|
|
384 | if (pl != op) // player is handled lazily |
|
|
385 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
386 | |
|
|
387 | op = op->env; |
|
|
388 | } |
|
|
389 | } |
|
|
390 | |
|
|
391 | /* |
319 | * sum_weight() is a recursive function which calculates the weight |
392 | * this is a recursive function which calculates the weight |
320 | * an object is carrying. It goes through in figures out how much |
393 | * an object is carrying. It goes through op and figures out how much |
321 | * containers are carrying, and sums it up. |
394 | * containers are carrying, and sums it up. |
322 | */ |
395 | */ |
323 | long |
396 | void |
324 | sum_weight (object *op) |
397 | object::update_weight () |
325 | { |
398 | { |
326 | long sum; |
399 | sint32 sum = 0; |
327 | object *inv; |
|
|
328 | |
400 | |
329 | for (sum = 0, inv = op->inv; inv; inv = inv->below) |
401 | for (object *op = inv; op; op = op->below) |
330 | { |
402 | { |
331 | if (inv->inv) |
403 | if (op->inv) |
332 | sum_weight (inv); |
404 | op->update_weight (); |
333 | |
405 | |
334 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
406 | sum += op->total_weight (); |
|
|
407 | } |
|
|
408 | |
|
|
409 | sum = weight_adjust_for (this, sum); |
|
|
410 | |
|
|
411 | if (sum != carrying) |
335 | } |
412 | { |
336 | |
|
|
337 | if (op->type == CONTAINER && op->stats.Str) |
|
|
338 | sum = (sum * (100 - op->stats.Str)) / 100; |
|
|
339 | |
|
|
340 | if (op->carrying != sum) |
|
|
341 | op->carrying = sum; |
413 | carrying = sum; |
342 | |
414 | |
343 | return sum; |
415 | if (object *pl = visible_to ()) |
|
|
416 | if (pl != this) // player is handled lazily |
|
|
417 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
418 | } |
344 | } |
419 | } |
345 | |
420 | |
346 | /** |
421 | /* |
347 | * Return the outermost environment object for a given object. |
422 | * Used by: Server DM commands: dumpbelow, dump. Some error messages. |
348 | */ |
|
|
349 | |
|
|
350 | object * |
|
|
351 | object_get_env_recursive (object *op) |
|
|
352 | { |
|
|
353 | while (op->env != NULL) |
|
|
354 | op = op->env; |
|
|
355 | return op; |
|
|
356 | } |
|
|
357 | |
|
|
358 | /* |
|
|
359 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
|
|
360 | * Some error messages. |
|
|
361 | * The result of the dump is stored in the static global errmsg array. |
|
|
362 | */ |
423 | */ |
363 | char * |
424 | char * |
364 | dump_object (object *op) |
425 | dump_object (object *op) |
365 | { |
426 | { |
366 | if (!op) |
427 | if (!op) |
… | |
… | |
374 | /* |
435 | /* |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
436 | * get_nearest_part(multi-object, object 2) returns the part of the |
376 | * multi-object 1 which is closest to the second object. |
437 | * multi-object 1 which is closest to the second object. |
377 | * If it's not a multi-object, it is returned. |
438 | * If it's not a multi-object, it is returned. |
378 | */ |
439 | */ |
379 | |
|
|
380 | object * |
440 | object * |
381 | get_nearest_part (object *op, const object *pl) |
441 | get_nearest_part (object *op, const object *pl) |
382 | { |
442 | { |
383 | object *tmp, *closest; |
443 | object *tmp, *closest; |
384 | int last_dist, i; |
444 | int last_dist, i; |
385 | |
445 | |
386 | if (op->more == NULL) |
446 | if (!op->more) |
387 | return op; |
447 | return op; |
|
|
448 | |
388 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
449 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
450 | tmp; |
|
|
451 | tmp = tmp->more) |
389 | if ((i = distance (tmp, pl)) < last_dist) |
452 | if ((i = distance (tmp, pl)) < last_dist) |
390 | closest = tmp, last_dist = i; |
453 | closest = tmp, last_dist = i; |
|
|
454 | |
391 | return closest; |
455 | return closest; |
392 | } |
456 | } |
393 | |
457 | |
394 | /* |
458 | /* |
395 | * Returns the object which has the count-variable equal to the argument. |
459 | * Returns the object which has the count-variable equal to the argument. |
|
|
460 | * VERRRY slow. |
396 | */ |
461 | */ |
397 | object * |
462 | object * |
398 | find_object (tag_t i) |
463 | find_object (tag_t i) |
399 | { |
464 | { |
400 | for_all_objects (op) |
465 | for_all_objects (op) |
… | |
… | |
411 | */ |
476 | */ |
412 | object * |
477 | object * |
413 | find_object_name (const char *str) |
478 | find_object_name (const char *str) |
414 | { |
479 | { |
415 | shstr_cmp str_ (str); |
480 | shstr_cmp str_ (str); |
416 | object *op; |
|
|
417 | |
481 | |
|
|
482 | if (str_) |
418 | for_all_objects (op) |
483 | for_all_objects (op) |
419 | if (op->name == str_) |
484 | if (op->name == str_) |
420 | break; |
485 | return op; |
421 | |
486 | |
422 | return op; |
487 | return 0; |
423 | } |
|
|
424 | |
|
|
425 | void |
|
|
426 | free_all_object_data () |
|
|
427 | { |
|
|
428 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
|
|
429 | } |
488 | } |
430 | |
489 | |
431 | /* |
490 | /* |
432 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * Sets the owner and sets the skill and exp pointers to owner's current |
433 | * skill and experience objects. |
492 | * skill and experience objects. |
|
|
493 | * ACTUALLY NO! investigate! TODO |
434 | */ |
494 | */ |
435 | void |
495 | void |
436 | object::set_owner (object *owner) |
496 | object::set_owner (object *owner) |
437 | { |
497 | { |
|
|
498 | // allow objects which own objects |
438 | if (!owner) |
499 | if (owner) |
439 | return; |
|
|
440 | |
|
|
441 | /* next line added to allow objects which own objects */ |
|
|
442 | /* Add a check for ownercounts in here, as I got into an endless loop |
|
|
443 | * with the fireball owning a poison cloud which then owned the |
|
|
444 | * fireball. I believe that was caused by one of the objects getting |
|
|
445 | * freed and then another object replacing it. Since the ownercounts |
|
|
446 | * didn't match, this check is valid and I believe that cause is valid. |
|
|
447 | */ |
|
|
448 | while (owner->owner) |
500 | while (owner->owner) |
449 | owner = owner->owner; |
501 | owner = owner->owner; |
|
|
502 | |
|
|
503 | if (flag [FLAG_FREED]) |
|
|
504 | { |
|
|
505 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
506 | return; |
|
|
507 | } |
450 | |
508 | |
451 | this->owner = owner; |
509 | this->owner = owner; |
452 | } |
510 | } |
453 | |
511 | |
454 | int |
512 | int |
… | |
… | |
532 | } |
590 | } |
533 | |
591 | |
534 | op->key_values = 0; |
592 | op->key_values = 0; |
535 | } |
593 | } |
536 | |
594 | |
537 | object & |
595 | /* |
538 | object::operator =(const object &src) |
596 | * copy_to first frees everything allocated by the dst object, |
|
|
597 | * and then copies the contents of itself into the second |
|
|
598 | * object, allocating what needs to be allocated. Basically, any |
|
|
599 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
600 | * if the first object is freed, the pointers in the new object |
|
|
601 | * will point at garbage. |
|
|
602 | */ |
|
|
603 | void |
|
|
604 | object::copy_to (object *dst) |
539 | { |
605 | { |
540 | bool is_freed = flag [FLAG_FREED]; |
606 | dst->remove (); |
541 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
542 | |
|
|
543 | *(object_copy *)this = src; |
607 | *(object_copy *)dst = *this; |
544 | |
|
|
545 | flag [FLAG_FREED] = is_freed; |
|
|
546 | flag [FLAG_REMOVED] = is_removed; |
608 | dst->flag [FLAG_REMOVED] = true; |
547 | |
609 | |
548 | /* Copy over key_values, if any. */ |
610 | /* Copy over key_values, if any. */ |
549 | if (src.key_values) |
611 | if (key_values) |
550 | { |
612 | { |
551 | key_value *tail = 0; |
613 | key_value *tail = 0; |
552 | key_values = 0; |
614 | dst->key_values = 0; |
553 | |
615 | |
554 | for (key_value *i = src.key_values; i; i = i->next) |
616 | for (key_value *i = key_values; i; i = i->next) |
555 | { |
617 | { |
556 | key_value *new_link = new key_value; |
618 | key_value *new_link = new key_value; |
557 | |
619 | |
558 | new_link->next = 0; |
620 | new_link->next = 0; |
559 | new_link->key = i->key; |
621 | new_link->key = i->key; |
560 | new_link->value = i->value; |
622 | new_link->value = i->value; |
561 | |
623 | |
562 | /* Try and be clever here, too. */ |
624 | /* Try and be clever here, too. */ |
563 | if (!key_values) |
625 | if (!dst->key_values) |
564 | { |
626 | { |
565 | key_values = new_link; |
627 | dst->key_values = new_link; |
566 | tail = new_link; |
628 | tail = new_link; |
567 | } |
629 | } |
568 | else |
630 | else |
569 | { |
631 | { |
570 | tail->next = new_link; |
632 | tail->next = new_link; |
571 | tail = new_link; |
633 | tail = new_link; |
572 | } |
634 | } |
573 | } |
635 | } |
574 | } |
636 | } |
575 | } |
|
|
576 | |
|
|
577 | /* |
|
|
578 | * copy_to first frees everything allocated by the dst object, |
|
|
579 | * and then copies the contents of itself into the second |
|
|
580 | * object, allocating what needs to be allocated. Basically, any |
|
|
581 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
582 | * if the first object is freed, the pointers in the new object |
|
|
583 | * will point at garbage. |
|
|
584 | */ |
|
|
585 | void |
|
|
586 | object::copy_to (object *dst) |
|
|
587 | { |
|
|
588 | *dst = *this; |
|
|
589 | |
637 | |
590 | if (speed < 0) |
638 | if (speed < 0) |
591 | dst->speed_left = speed_left - rndm (); |
639 | dst->speed_left -= rndm (); |
592 | |
640 | |
593 | dst->set_speed (dst->speed); |
641 | dst->set_speed (dst->speed); |
594 | } |
642 | } |
595 | |
643 | |
596 | void |
644 | void |
597 | object::instantiate () |
645 | object::instantiate () |
598 | { |
646 | { |
599 | if (!uuid.seq) // HACK |
647 | if (!uuid.seq) // HACK |
600 | uuid = gen_uuid (); |
648 | uuid = UUID::gen (); |
601 | |
649 | |
602 | speed_left = -0.1f; |
650 | speed_left = -0.1f; |
603 | /* copy the body_info to the body_used - this is only really |
651 | /* copy the body_info to the body_used - this is only really |
604 | * need for monsters, but doesn't hurt to do it for everything. |
652 | * need for monsters, but doesn't hurt to do it for everything. |
605 | * by doing so, when a monster is created, it has good starting |
653 | * by doing so, when a monster is created, it has good starting |
… | |
… | |
615 | object * |
663 | object * |
616 | object::clone () |
664 | object::clone () |
617 | { |
665 | { |
618 | object *neu = create (); |
666 | object *neu = create (); |
619 | copy_to (neu); |
667 | copy_to (neu); |
|
|
668 | neu->map = map; // not copied by copy_to |
620 | return neu; |
669 | return neu; |
621 | } |
670 | } |
622 | |
671 | |
623 | /* |
672 | /* |
624 | * If an object with the IS_TURNABLE() flag needs to be turned due |
673 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
675 | * UP_OBJ_FACE: only the objects face has changed. |
724 | * UP_OBJ_FACE: only the objects face has changed. |
676 | */ |
725 | */ |
677 | void |
726 | void |
678 | update_object (object *op, int action) |
727 | update_object (object *op, int action) |
679 | { |
728 | { |
680 | if (op == NULL) |
729 | if (!op) |
681 | { |
730 | { |
682 | /* this should never happen */ |
731 | /* this should never happen */ |
683 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
732 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
684 | return; |
733 | return; |
685 | } |
734 | } |
686 | |
735 | |
687 | if (op->env) |
736 | if (!op->is_on_map ()) |
688 | { |
737 | { |
689 | /* Animation is currently handled by client, so nothing |
738 | /* Animation is currently handled by client, so nothing |
690 | * to do in this case. |
739 | * to do in this case. |
691 | */ |
740 | */ |
692 | return; |
741 | return; |
693 | } |
742 | } |
694 | |
|
|
695 | /* If the map is saving, don't do anything as everything is |
|
|
696 | * going to get freed anyways. |
|
|
697 | */ |
|
|
698 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
699 | return; |
|
|
700 | |
743 | |
701 | /* make sure the object is within map boundaries */ |
744 | /* make sure the object is within map boundaries */ |
702 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
745 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
703 | { |
746 | { |
704 | LOG (llevError, "update_object() called for object out of map!\n"); |
747 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
723 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
724 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
725 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
726 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
727 | /* This isn't perfect, but I don't expect a lot of objects to |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
728 | * to have move_allow right now. |
771 | * have move_allow right now. |
729 | */ |
772 | */ |
730 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
773 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
731 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
732 | m.flags_ = 0; |
775 | m.flags_ = 0; |
733 | } |
776 | } |
… | |
… | |
764 | static int object_count; |
807 | static int object_count; |
765 | |
808 | |
766 | void object::link () |
809 | void object::link () |
767 | { |
810 | { |
768 | assert (!index);//D |
811 | assert (!index);//D |
769 | uuid = gen_uuid (); |
812 | uuid = UUID::gen (); |
770 | count = ++object_count; |
813 | count = ++object_count; |
771 | |
814 | |
772 | refcnt_inc (); |
815 | refcnt_inc (); |
773 | objects.insert (this); |
816 | objects.insert (this); |
774 | } |
817 | } |
… | |
… | |
847 | object::destroy_inv (bool drop_to_ground) |
890 | object::destroy_inv (bool drop_to_ground) |
848 | { |
891 | { |
849 | // need to check first, because the checks below might segfault |
892 | // need to check first, because the checks below might segfault |
850 | // as we might be on an invalid mapspace and crossfire code |
893 | // as we might be on an invalid mapspace and crossfire code |
851 | // is too buggy to ensure that the inventory is empty. |
894 | // is too buggy to ensure that the inventory is empty. |
852 | // corollary: if you create arrows etc. with stuff in tis inventory, |
895 | // corollary: if you create arrows etc. with stuff in its inventory, |
853 | // cf will crash below with off-map x and y |
896 | // cf will crash below with off-map x and y |
854 | if (!inv) |
897 | if (!inv) |
855 | return; |
898 | return; |
856 | |
899 | |
857 | /* Only if the space blocks everything do we not process - |
900 | /* Only if the space blocks everything do we not process - |
858 | * if some form of movement is allowed, let objects |
901 | * if some form of movement is allowed, let objects |
859 | * drop on that space. |
902 | * drop on that space. |
860 | */ |
903 | */ |
861 | if (!drop_to_ground |
904 | if (!drop_to_ground |
862 | || !map |
905 | || !map |
863 | || map->in_memory != MAP_IN_MEMORY |
906 | || map->in_memory != MAP_ACTIVE |
864 | || map->nodrop |
907 | || map->no_drop |
865 | || ms ().move_block == MOVE_ALL) |
908 | || ms ().move_block == MOVE_ALL) |
866 | { |
909 | { |
867 | while (inv) |
910 | while (inv) |
868 | { |
|
|
869 | inv->destroy_inv (drop_to_ground); |
|
|
870 | inv->destroy (); |
911 | inv->destroy (true); |
871 | } |
|
|
872 | } |
912 | } |
873 | else |
913 | else |
874 | { /* Put objects in inventory onto this space */ |
914 | { /* Put objects in inventory onto this space */ |
875 | while (inv) |
915 | while (inv) |
876 | { |
916 | { |
… | |
… | |
880 | || op->flag [FLAG_NO_DROP] |
920 | || op->flag [FLAG_NO_DROP] |
881 | || op->type == RUNE |
921 | || op->type == RUNE |
882 | || op->type == TRAP |
922 | || op->type == TRAP |
883 | || op->flag [FLAG_IS_A_TEMPLATE] |
923 | || op->flag [FLAG_IS_A_TEMPLATE] |
884 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
924 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
885 | op->destroy (); |
925 | op->destroy (true); |
886 | else |
926 | else |
887 | map->insert (op, x, y); |
927 | map->insert (op, x, y); |
888 | } |
928 | } |
889 | } |
929 | } |
890 | } |
930 | } |
… | |
… | |
894 | object *op = new object; |
934 | object *op = new object; |
895 | op->link (); |
935 | op->link (); |
896 | return op; |
936 | return op; |
897 | } |
937 | } |
898 | |
938 | |
|
|
939 | static struct freed_map : maptile |
|
|
940 | { |
|
|
941 | freed_map () |
|
|
942 | { |
|
|
943 | path = "<freed objects map>"; |
|
|
944 | name = "/internal/freed_objects_map"; |
|
|
945 | width = 3; |
|
|
946 | height = 3; |
|
|
947 | no_drop = 1; |
|
|
948 | no_reset = 1; |
|
|
949 | |
|
|
950 | alloc (); |
|
|
951 | in_memory = MAP_ACTIVE; |
|
|
952 | } |
|
|
953 | |
|
|
954 | ~freed_map () |
|
|
955 | { |
|
|
956 | destroy (); |
|
|
957 | } |
|
|
958 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
959 | |
899 | void |
960 | void |
900 | object::do_destroy () |
961 | object::do_destroy () |
901 | { |
962 | { |
902 | attachable::do_destroy (); |
|
|
903 | |
|
|
904 | if (flag [FLAG_IS_LINKED]) |
963 | if (flag [FLAG_IS_LINKED]) |
905 | remove_button_link (this); |
964 | remove_button_link (this); |
906 | |
965 | |
907 | if (flag [FLAG_FRIENDLY]) |
966 | if (flag [FLAG_FRIENDLY]) |
908 | remove_friendly_object (this); |
967 | remove_friendly_object (this); |
909 | |
968 | |
910 | if (!flag [FLAG_REMOVED]) |
|
|
911 | remove (); |
969 | remove (); |
912 | |
970 | |
913 | destroy_inv (true); |
971 | attachable::do_destroy (); |
914 | |
972 | |
915 | deactivate (); |
973 | deactivate (); |
916 | unlink (); |
974 | unlink (); |
917 | |
975 | |
918 | flag [FLAG_FREED] = 1; |
976 | flag [FLAG_FREED] = 1; |
919 | |
977 | |
920 | // hack to ensure that freed objects still have a valid map |
978 | // hack to ensure that freed objects still have a valid map |
921 | { |
|
|
922 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
923 | |
|
|
924 | if (!freed_map) |
|
|
925 | { |
|
|
926 | freed_map = new maptile; |
|
|
927 | |
|
|
928 | freed_map->name = "/internal/freed_objects_map"; |
|
|
929 | freed_map->width = 3; |
|
|
930 | freed_map->height = 3; |
|
|
931 | |
|
|
932 | freed_map->alloc (); |
|
|
933 | freed_map->in_memory = MAP_IN_MEMORY; |
|
|
934 | } |
|
|
935 | |
|
|
936 | map = freed_map; |
979 | map = &freed_map; |
937 | x = 1; |
980 | x = 1; |
938 | y = 1; |
981 | y = 1; |
939 | } |
|
|
940 | |
982 | |
941 | if (more) |
983 | if (more) |
942 | { |
984 | { |
943 | more->destroy (); |
985 | more->destroy (); |
944 | more = 0; |
986 | more = 0; |
… | |
… | |
957 | object::destroy (bool destroy_inventory) |
999 | object::destroy (bool destroy_inventory) |
958 | { |
1000 | { |
959 | if (destroyed ()) |
1001 | if (destroyed ()) |
960 | return; |
1002 | return; |
961 | |
1003 | |
|
|
1004 | if (!is_head () && !head->destroyed ()) |
|
|
1005 | { |
|
|
1006 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1007 | head->destroy (destroy_inventory); |
|
|
1008 | return; |
|
|
1009 | } |
|
|
1010 | |
962 | if (destroy_inventory) |
1011 | destroy_inv (!destroy_inventory); |
963 | destroy_inv (false); |
1012 | |
|
|
1013 | if (is_head ()) |
|
|
1014 | if (sound_destroy) |
|
|
1015 | play_sound (sound_destroy); |
|
|
1016 | else if (flag [FLAG_MONSTER]) |
|
|
1017 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
964 | |
1018 | |
965 | attachable::destroy (); |
1019 | attachable::destroy (); |
966 | } |
|
|
967 | |
|
|
968 | /* |
|
|
969 | * sub_weight() recursively (outwards) subtracts a number from the |
|
|
970 | * weight of an object (and what is carried by it's environment(s)). |
|
|
971 | */ |
|
|
972 | void |
|
|
973 | sub_weight (object *op, signed long weight) |
|
|
974 | { |
|
|
975 | while (op != NULL) |
|
|
976 | { |
|
|
977 | if (op->type == CONTAINER) |
|
|
978 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
979 | |
|
|
980 | op->carrying -= weight; |
|
|
981 | op = op->env; |
|
|
982 | } |
|
|
983 | } |
1020 | } |
984 | |
1021 | |
985 | /* op->remove (): |
1022 | /* op->remove (): |
986 | * This function removes the object op from the linked list of objects |
1023 | * This function removes the object op from the linked list of objects |
987 | * which it is currently tied to. When this function is done, the |
1024 | * which it is currently tied to. When this function is done, the |
… | |
… | |
993 | object::do_remove () |
1030 | object::do_remove () |
994 | { |
1031 | { |
995 | object *tmp, *last = 0; |
1032 | object *tmp, *last = 0; |
996 | object *otmp; |
1033 | object *otmp; |
997 | |
1034 | |
998 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1035 | if (flag [FLAG_REMOVED]) |
999 | return; |
1036 | return; |
1000 | |
1037 | |
1001 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1002 | INVOKE_OBJECT (REMOVE, this); |
1038 | INVOKE_OBJECT (REMOVE, this); |
|
|
1039 | |
|
|
1040 | flag [FLAG_REMOVED] = true; |
1003 | |
1041 | |
1004 | if (more) |
1042 | if (more) |
1005 | more->remove (); |
1043 | more->remove (); |
1006 | |
1044 | |
1007 | /* |
1045 | /* |
1008 | * In this case, the object to be removed is in someones |
1046 | * In this case, the object to be removed is in someones |
1009 | * inventory. |
1047 | * inventory. |
1010 | */ |
1048 | */ |
1011 | if (env) |
1049 | if (env) |
1012 | { |
1050 | { |
1013 | if (nrof) |
1051 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1014 | sub_weight (env, weight * nrof); |
1052 | if (object *pl = visible_to ()) |
1015 | else |
1053 | esrv_del_item (pl->contr, count); |
1016 | sub_weight (env, weight + carrying); |
1054 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1055 | |
|
|
1056 | adjust_weight (env, -total_weight ()); |
|
|
1057 | |
|
|
1058 | /* we set up values so that it could be inserted into |
|
|
1059 | * the map, but we don't actually do that - it is up |
|
|
1060 | * to the caller to decide what we want to do. |
|
|
1061 | */ |
|
|
1062 | map = env->map; |
|
|
1063 | x = env->x; |
|
|
1064 | y = env->y; |
|
|
1065 | |
|
|
1066 | // make sure cmov optimisation is applicable |
|
|
1067 | *(above ? &above->below : &env->inv) = below; |
|
|
1068 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1069 | |
|
|
1070 | above = 0; |
|
|
1071 | below = 0; |
|
|
1072 | env = 0; |
1017 | |
1073 | |
1018 | /* NO_FIX_PLAYER is set when a great many changes are being |
1074 | /* NO_FIX_PLAYER is set when a great many changes are being |
1019 | * made to players inventory. If set, avoiding the call |
1075 | * made to players inventory. If set, avoiding the call |
1020 | * to save cpu time. |
1076 | * to save cpu time. |
1021 | */ |
1077 | */ |
1022 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1078 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1023 | otmp->update_stats (); |
1079 | otmp->update_stats (); |
1024 | |
|
|
1025 | if (above) |
|
|
1026 | above->below = below; |
|
|
1027 | else |
|
|
1028 | env->inv = below; |
|
|
1029 | |
|
|
1030 | if (below) |
|
|
1031 | below->above = above; |
|
|
1032 | |
|
|
1033 | /* we set up values so that it could be inserted into |
|
|
1034 | * the map, but we don't actually do that - it is up |
|
|
1035 | * to the caller to decide what we want to do. |
|
|
1036 | */ |
|
|
1037 | x = env->x, y = env->y; |
|
|
1038 | map = env->map; |
|
|
1039 | above = 0, below = 0; |
|
|
1040 | env = 0; |
|
|
1041 | } |
1080 | } |
1042 | else if (map) |
1081 | else if (map) |
1043 | { |
1082 | { |
1044 | if (type == PLAYER) |
|
|
1045 | { |
|
|
1046 | // leaving a spot always closes any open container on the ground |
|
|
1047 | if (container && !container->env) |
|
|
1048 | // this causes spurious floorbox updates, but it ensures |
|
|
1049 | // that the CLOSE event is being sent. |
|
|
1050 | close_container (); |
|
|
1051 | |
|
|
1052 | --map->players; |
|
|
1053 | map->touch (); |
|
|
1054 | } |
|
|
1055 | |
|
|
1056 | map->dirty = true; |
1083 | map->dirty = true; |
1057 | mapspace &ms = this->ms (); |
1084 | mapspace &ms = this->ms (); |
1058 | |
1085 | |
|
|
1086 | if (object *pl = ms.player ()) |
|
|
1087 | { |
|
|
1088 | if (type == PLAYER) // this == pl(!) |
|
|
1089 | { |
|
|
1090 | // leaving a spot always closes any open container on the ground |
|
|
1091 | if (container && !container->env) |
|
|
1092 | // this causes spurious floorbox updates, but it ensures |
|
|
1093 | // that the CLOSE event is being sent. |
|
|
1094 | close_container (); |
|
|
1095 | |
|
|
1096 | --map->players; |
|
|
1097 | map->touch (); |
|
|
1098 | } |
|
|
1099 | else if (pl->container == this) |
|
|
1100 | { |
|
|
1101 | // removing a container should close it |
|
|
1102 | close_container (); |
|
|
1103 | } |
|
|
1104 | |
|
|
1105 | esrv_del_item (pl->contr, count); |
|
|
1106 | } |
|
|
1107 | |
1059 | /* link the object above us */ |
1108 | /* link the object above us */ |
1060 | if (above) |
1109 | // re-link, make sure compiler can easily use cmove |
1061 | above->below = below; |
1110 | *(above ? &above->below : &ms.top) = below; |
1062 | else |
1111 | *(below ? &below->above : &ms.bot) = above; |
1063 | ms.top = below; /* we were top, set new top */ |
|
|
1064 | |
|
|
1065 | /* Relink the object below us, if there is one */ |
|
|
1066 | if (below) |
|
|
1067 | below->above = above; |
|
|
1068 | else |
|
|
1069 | { |
|
|
1070 | /* Nothing below, which means we need to relink map object for this space |
|
|
1071 | * use translated coordinates in case some oddness with map tiling is |
|
|
1072 | * evident |
|
|
1073 | */ |
|
|
1074 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1075 | 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 | |
|
|
1077 | ms.bot = above; /* goes on above it. */ |
|
|
1078 | } |
|
|
1079 | |
1112 | |
1080 | above = 0; |
1113 | above = 0; |
1081 | below = 0; |
1114 | below = 0; |
1082 | |
1115 | |
|
|
1116 | ms.flags_ = 0; |
|
|
1117 | |
1083 | if (map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1084 | return; |
1119 | return; |
1085 | |
1120 | |
1086 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1121 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
|
|
1122 | |
|
|
1123 | if (object *pl = ms.player ()) |
|
|
1124 | { |
|
|
1125 | if (pl->container == this) |
|
|
1126 | /* If a container that the player is currently using somehow gets |
|
|
1127 | * removed (most likely destroyed), update the player view |
|
|
1128 | * appropriately. |
|
|
1129 | */ |
|
|
1130 | pl->close_container (); |
|
|
1131 | |
|
|
1132 | //TODO: the floorbox prev/next might need updating |
|
|
1133 | //esrv_del_item (pl->contr, count); |
|
|
1134 | //TODO: update floorbox to preserve ordering |
|
|
1135 | if (pl->contr->ns) |
|
|
1136 | pl->contr->ns->floorbox_update (); |
|
|
1137 | } |
1087 | |
1138 | |
1088 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1139 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1089 | { |
1140 | { |
1090 | /* No point updating the players look faces if he is the object |
1141 | /* No point updating the players look faces if he is the object |
1091 | * being removed. |
1142 | * being removed. |
1092 | */ |
1143 | */ |
1093 | |
|
|
1094 | if (tmp->type == PLAYER && tmp != this) |
|
|
1095 | { |
|
|
1096 | /* If a container that the player is currently using somehow gets |
|
|
1097 | * removed (most likely destroyed), update the player view |
|
|
1098 | * appropriately. |
|
|
1099 | */ |
|
|
1100 | if (tmp->container == this) |
|
|
1101 | { |
|
|
1102 | flag [FLAG_APPLIED] = 0; |
|
|
1103 | tmp->container = 0; |
|
|
1104 | } |
|
|
1105 | |
|
|
1106 | if (tmp->contr->ns) |
|
|
1107 | tmp->contr->ns->floorbox_update (); |
|
|
1108 | } |
|
|
1109 | |
1144 | |
1110 | /* See if object moving off should effect something */ |
1145 | /* See if object moving off should effect something */ |
1111 | if (check_walk_off |
1146 | if (check_walk_off |
1112 | && ((move_type & tmp->move_off) |
1147 | && ((move_type & tmp->move_off) |
1113 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1148 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
… | |
… | |
1119 | } |
1154 | } |
1120 | |
1155 | |
1121 | last = tmp; |
1156 | last = tmp; |
1122 | } |
1157 | } |
1123 | |
1158 | |
1124 | /* last == NULL if there are no objects on this space */ |
|
|
1125 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1126 | if (!last) |
|
|
1127 | map->at (x, y).flags_ = 0; |
|
|
1128 | else |
|
|
1129 | update_object (last, UP_OBJ_REMOVE); |
|
|
1130 | |
|
|
1131 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1159 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1132 | update_all_los (map, x, y); |
1160 | update_all_los (map, x, y); |
1133 | } |
1161 | } |
1134 | } |
1162 | } |
1135 | |
1163 | |
… | |
… | |
1145 | merge_ob (object *op, object *top) |
1173 | merge_ob (object *op, object *top) |
1146 | { |
1174 | { |
1147 | if (!op->nrof) |
1175 | if (!op->nrof) |
1148 | return 0; |
1176 | return 0; |
1149 | |
1177 | |
1150 | if (top) |
1178 | if (!top) |
1151 | for (top = op; top && top->above; top = top->above) |
1179 | for (top = op; top && top->above; top = top->above) |
1152 | ; |
1180 | ; |
1153 | |
1181 | |
1154 | for (; top; top = top->below) |
1182 | for (; top; top = top->below) |
1155 | { |
|
|
1156 | if (top == op) |
|
|
1157 | continue; |
|
|
1158 | |
|
|
1159 | if (object::can_merge (op, top)) |
1183 | if (object::can_merge (op, top)) |
1160 | { |
1184 | { |
1161 | top->nrof += op->nrof; |
1185 | top->nrof += op->nrof; |
1162 | |
1186 | |
1163 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1187 | if (object *pl = top->visible_to ()) |
1164 | op->weight = 0; /* Don't want any adjustements now */ |
1188 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1189 | |
|
|
1190 | op->weight = 0; // cancel the addition above |
|
|
1191 | op->carrying = 0; // must be 0 already |
|
|
1192 | |
1165 | op->destroy (); |
1193 | op->destroy (1); |
|
|
1194 | |
1166 | return top; |
1195 | return top; |
1167 | } |
1196 | } |
1168 | } |
|
|
1169 | |
1197 | |
1170 | return 0; |
1198 | return 0; |
1171 | } |
1199 | } |
1172 | |
1200 | |
1173 | void |
1201 | void |
… | |
… | |
1198 | * job preparing multi-part monsters. |
1226 | * job preparing multi-part monsters. |
1199 | */ |
1227 | */ |
1200 | object * |
1228 | object * |
1201 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1229 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1202 | { |
1230 | { |
|
|
1231 | op->remove (); |
|
|
1232 | |
1203 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1233 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1204 | { |
1234 | { |
1205 | tmp->x = x + tmp->arch->x; |
1235 | tmp->x = x + tmp->arch->x; |
1206 | tmp->y = y + tmp->arch->y; |
1236 | tmp->y = y + tmp->arch->y; |
1207 | } |
1237 | } |
… | |
… | |
1230 | * just 'op' otherwise |
1260 | * just 'op' otherwise |
1231 | */ |
1261 | */ |
1232 | object * |
1262 | object * |
1233 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1263 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1234 | { |
1264 | { |
1235 | assert (!op->flag [FLAG_FREED]); |
1265 | if (op->is_on_map ()) |
1236 | |
|
|
1237 | object *top, *floor = NULL; |
|
|
1238 | |
|
|
1239 | op->remove (); |
|
|
1240 | |
|
|
1241 | #if 0 |
|
|
1242 | if (!m->active != !op->active) |
|
|
1243 | if (m->active) |
|
|
1244 | op->activate_recursive (); |
|
|
1245 | else |
|
|
1246 | op->deactivate_recursive (); |
|
|
1247 | #endif |
|
|
1248 | |
|
|
1249 | if (out_of_map (m, op->x, op->y)) |
|
|
1250 | { |
1266 | { |
1251 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
1267 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
1252 | #ifdef MANY_CORES |
|
|
1253 | /* Better to catch this here, as otherwise the next use of this object |
|
|
1254 | * is likely to cause a crash. Better to find out where it is getting |
|
|
1255 | * improperly inserted. |
|
|
1256 | */ |
|
|
1257 | abort (); |
1268 | abort (); |
1258 | #endif |
1269 | } |
1259 | return op; |
1270 | |
|
|
1271 | if (op->env) |
1260 | } |
1272 | { |
|
|
1273 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
|
|
1274 | op->remove (); |
|
|
1275 | } |
1261 | |
1276 | |
1262 | if (object *more = op->more) |
1277 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1263 | if (!insert_ob_in_map (more, m, originator, flag)) |
1278 | {//D |
1264 | return 0; |
1279 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1265 | |
1280 | op->face = 1;//D |
1266 | CLEAR_FLAG (op, FLAG_REMOVED); |
1281 | }//D |
1267 | |
1282 | |
1268 | /* Ideally, the caller figures this out. However, it complicates a lot |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1269 | * of areas of callers (eg, anything that uses find_free_spot would now |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1270 | * need extra work |
1285 | * need extra work |
1271 | */ |
1286 | */ |
1272 | if (!xy_normalise (m, op->x, op->y)) |
1287 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1288 | { |
|
|
1289 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1273 | return 0; |
1290 | return 0; |
|
|
1291 | } |
|
|
1292 | |
|
|
1293 | if (object *more = op->more) |
|
|
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1295 | return 0; |
|
|
1296 | |
|
|
1297 | CLEAR_FLAG (op, FLAG_REMOVED); |
1274 | |
1298 | |
1275 | op->map = m; |
1299 | op->map = m; |
1276 | mapspace &ms = op->ms (); |
1300 | mapspace &ms = op->ms (); |
1277 | |
1301 | |
1278 | /* this has to be done after we translate the coordinates. |
1302 | /* this has to be done after we translate the coordinates. |
1279 | */ |
1303 | */ |
1280 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1281 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1305 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1282 | if (object::can_merge (op, tmp)) |
1306 | if (object::can_merge (op, tmp)) |
1283 | { |
1307 | { |
|
|
1308 | // TODO: we actually want to update tmp, not op, |
|
|
1309 | // but some caller surely breaks when we return tmp |
|
|
1310 | // from here :/ |
1284 | op->nrof += tmp->nrof; |
1311 | op->nrof += tmp->nrof; |
1285 | tmp->destroy (); |
1312 | tmp->destroy (1); |
1286 | } |
1313 | } |
1287 | |
1314 | |
1288 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1315 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1289 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1316 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1290 | |
1317 | |
… | |
… | |
1297 | { |
1324 | { |
1298 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1299 | abort (); |
1326 | abort (); |
1300 | } |
1327 | } |
1301 | |
1328 | |
|
|
1329 | if (!originator->is_on_map ()) |
|
|
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1331 | op->debug_desc (), originator->debug_desc ()); |
|
|
1332 | |
1302 | op->above = originator; |
1333 | op->above = originator; |
1303 | op->below = originator->below; |
1334 | op->below = originator->below; |
1304 | |
|
|
1305 | if (op->below) |
|
|
1306 | op->below->above = op; |
|
|
1307 | else |
|
|
1308 | ms.bot = op; |
|
|
1309 | |
|
|
1310 | /* since *below* originator, no need to update top */ |
|
|
1311 | originator->below = op; |
1335 | originator->below = op; |
|
|
1336 | |
|
|
1337 | *(op->below ? &op->below->above : &ms.bot) = op; |
1312 | } |
1338 | } |
1313 | else |
1339 | else |
1314 | { |
1340 | { |
1315 | top = ms.bot; |
1341 | object *floor = 0; |
|
|
1342 | object *top = ms.top; |
1316 | |
1343 | |
1317 | /* If there are other objects, then */ |
1344 | /* If there are other objects, then */ |
1318 | if ((!(flag & INS_MAP_LOAD)) && top) |
1345 | if (top) |
1319 | { |
1346 | { |
1320 | object *last = 0; |
|
|
1321 | |
|
|
1322 | /* |
1347 | /* |
1323 | * If there are multiple objects on this space, we do some trickier handling. |
1348 | * If there are multiple objects on this space, we do some trickier handling. |
1324 | * We've already dealt with merging if appropriate. |
1349 | * We've already dealt with merging if appropriate. |
1325 | * Generally, we want to put the new object on top. But if |
1350 | * Generally, we want to put the new object on top. But if |
1326 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1351 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1329 | * once we get to them. This reduces the need to traverse over all of |
1354 | * once we get to them. This reduces the need to traverse over all of |
1330 | * them when adding another one - this saves quite a bit of cpu time |
1355 | * them when adding another one - this saves quite a bit of cpu time |
1331 | * when lots of spells are cast in one area. Currently, it is presumed |
1356 | * when lots of spells are cast in one area. Currently, it is presumed |
1332 | * that flying non pickable objects are spell objects. |
1357 | * that flying non pickable objects are spell objects. |
1333 | */ |
1358 | */ |
1334 | for (top = ms.bot; top; top = top->above) |
1359 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1335 | { |
1360 | { |
1336 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1361 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1337 | floor = top; |
1362 | floor = tmp; |
1338 | |
1363 | |
1339 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1364 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1340 | { |
1365 | { |
1341 | /* We insert above top, so we want this object below this */ |
1366 | /* We insert above top, so we want this object below this */ |
1342 | top = top->below; |
1367 | top = tmp->below; |
1343 | break; |
1368 | break; |
1344 | } |
1369 | } |
1345 | |
1370 | |
1346 | last = top; |
1371 | top = tmp; |
1347 | } |
1372 | } |
1348 | |
|
|
1349 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1350 | top = last; |
|
|
1351 | |
1373 | |
1352 | /* We let update_position deal with figuring out what the space |
1374 | /* We let update_position deal with figuring out what the space |
1353 | * looks like instead of lots of conditions here. |
1375 | * looks like instead of lots of conditions here. |
1354 | * makes things faster, and effectively the same result. |
1376 | * makes things faster, and effectively the same result. |
1355 | */ |
1377 | */ |
… | |
… | |
1362 | */ |
1384 | */ |
1363 | if (!(flag & INS_ON_TOP) |
1385 | if (!(flag & INS_ON_TOP) |
1364 | && ms.flags () & P_BLOCKSVIEW |
1386 | && ms.flags () & P_BLOCKSVIEW |
1365 | && (op->face && !faces [op->face].visibility)) |
1387 | && (op->face && !faces [op->face].visibility)) |
1366 | { |
1388 | { |
|
|
1389 | object *last; |
|
|
1390 | |
1367 | for (last = top; last != floor; last = last->below) |
1391 | for (last = top; last != floor; last = last->below) |
1368 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1392 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1369 | break; |
1393 | break; |
1370 | |
1394 | |
1371 | /* Check to see if we found the object that blocks view, |
1395 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1375 | */ |
1399 | */ |
1376 | if (last && last->below && last != floor) |
1400 | if (last && last->below && last != floor) |
1377 | top = last->below; |
1401 | top = last->below; |
1378 | } |
1402 | } |
1379 | } /* If objects on this space */ |
1403 | } /* If objects on this space */ |
1380 | if (flag & INS_MAP_LOAD) |
|
|
1381 | top = ms.top; |
|
|
1382 | |
1404 | |
1383 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1405 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1384 | top = floor; |
1406 | top = floor; |
1385 | |
1407 | |
1386 | /* Top is the object that our object (op) is going to get inserted above. |
1408 | // insert object above top, or bottom-most if top = 0 |
1387 | */ |
|
|
1388 | |
|
|
1389 | /* First object on this space */ |
|
|
1390 | if (!top) |
1409 | if (!top) |
1391 | { |
1410 | { |
|
|
1411 | op->below = 0; |
1392 | op->above = ms.bot; |
1412 | op->above = ms.bot; |
1393 | |
|
|
1394 | if (op->above) |
|
|
1395 | op->above->below = op; |
|
|
1396 | |
|
|
1397 | op->below = 0; |
|
|
1398 | ms.bot = op; |
1413 | ms.bot = op; |
|
|
1414 | |
|
|
1415 | *(op->above ? &op->above->below : &ms.top) = op; |
1399 | } |
1416 | } |
1400 | else |
1417 | else |
1401 | { /* get inserted into the stack above top */ |
1418 | { |
1402 | op->above = top->above; |
1419 | op->above = top->above; |
1403 | |
|
|
1404 | if (op->above) |
|
|
1405 | op->above->below = op; |
1420 | top->above = op; |
1406 | |
1421 | |
1407 | op->below = top; |
1422 | op->below = top; |
1408 | top->above = op; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1409 | } |
1424 | } |
1410 | |
1425 | } |
1411 | if (!op->above) |
|
|
1412 | ms.top = op; |
|
|
1413 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1414 | |
1426 | |
1415 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1416 | { |
1428 | { |
1417 | op->contr->do_los = 1; |
1429 | op->contr->do_los = 1; |
1418 | ++op->map->players; |
1430 | ++op->map->players; |
1419 | op->map->touch (); |
1431 | op->map->touch (); |
1420 | } |
1432 | } |
1421 | |
1433 | |
1422 | op->map->dirty = true; |
1434 | op->map->dirty = true; |
1423 | |
1435 | |
1424 | /* If we have a floor, we know the player, if any, will be above |
|
|
1425 | * it, so save a few ticks and start from there. |
|
|
1426 | */ |
|
|
1427 | if (!(flag & INS_MAP_LOAD)) |
|
|
1428 | if (object *pl = ms.player ()) |
1436 | if (object *pl = ms.player ()) |
|
|
1437 | //TODO: the floorbox prev/next might need updating |
|
|
1438 | //esrv_send_item (pl, op); |
|
|
1439 | //TODO: update floorbox to preserve ordering |
1429 | if (pl->contr->ns) |
1440 | if (pl->contr->ns) |
1430 | pl->contr->ns->floorbox_update (); |
1441 | pl->contr->ns->floorbox_update (); |
1431 | |
1442 | |
1432 | /* If this object glows, it may affect lighting conditions that are |
1443 | /* If this object glows, it may affect lighting conditions that are |
1433 | * visible to others on this map. But update_all_los is really |
1444 | * visible to others on this map. But update_all_los is really |
1434 | * an inefficient way to do this, as it means los for all players |
1445 | * an inefficient way to do this, as it means los for all players |
1435 | * on the map will get recalculated. The players could very well |
1446 | * on the map will get recalculated. The players could very well |
… | |
… | |
1477 | * op is the object to insert it under: supplies x and the map. |
1488 | * op is the object to insert it under: supplies x and the map. |
1478 | */ |
1489 | */ |
1479 | void |
1490 | void |
1480 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1491 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1481 | { |
1492 | { |
1482 | object *tmp, *tmp1; |
|
|
1483 | |
|
|
1484 | /* first search for itself and remove any old instances */ |
1493 | /* first search for itself and remove any old instances */ |
1485 | |
1494 | |
1486 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1495 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1487 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1496 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1488 | tmp->destroy (); |
1497 | tmp->destroy (1); |
1489 | |
1498 | |
1490 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1499 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1491 | |
1500 | |
1492 | tmp1->x = op->x; |
1501 | tmp->x = op->x; |
1493 | tmp1->y = op->y; |
1502 | tmp->y = op->y; |
|
|
1503 | |
1494 | insert_ob_in_map (tmp1, op->map, op, 0); |
1504 | insert_ob_in_map (tmp, op->map, op, 0); |
1495 | } |
1505 | } |
1496 | |
1506 | |
1497 | object * |
1507 | object * |
1498 | object::insert_at (object *where, object *originator, int flags) |
1508 | object::insert_at (object *where, object *originator, int flags) |
1499 | { |
1509 | { |
|
|
1510 | if (where->env) |
|
|
1511 | return where->env->insert (this); |
|
|
1512 | else |
1500 | return where->map->insert (this, where->x, where->y, originator, flags); |
1513 | return where->map->insert (this, where->x, where->y, originator, flags); |
1501 | } |
1514 | } |
1502 | |
1515 | |
1503 | /* |
1516 | /* |
1504 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
|
|
1505 | * is returned contains nr objects, and the remaining parts contains |
|
|
1506 | * the rest (or is removed and freed if that number is 0). |
|
|
1507 | * On failure, NULL is returned, and the reason put into the |
|
|
1508 | * global static errmsg array. |
|
|
1509 | */ |
|
|
1510 | object * |
|
|
1511 | get_split_ob (object *orig_ob, uint32 nr) |
|
|
1512 | { |
|
|
1513 | object *newob; |
|
|
1514 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
|
|
1515 | |
|
|
1516 | if (orig_ob->nrof < nr) |
|
|
1517 | { |
|
|
1518 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1519 | return NULL; |
|
|
1520 | } |
|
|
1521 | |
|
|
1522 | newob = object_create_clone (orig_ob); |
|
|
1523 | |
|
|
1524 | if ((orig_ob->nrof -= nr) < 1) |
|
|
1525 | orig_ob->destroy (1); |
|
|
1526 | else if (!is_removed) |
|
|
1527 | { |
|
|
1528 | if (orig_ob->env != NULL) |
|
|
1529 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
|
|
1530 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
|
|
1531 | { |
|
|
1532 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
|
|
1533 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
|
|
1534 | return NULL; |
|
|
1535 | } |
|
|
1536 | } |
|
|
1537 | |
|
|
1538 | newob->nrof = nr; |
|
|
1539 | |
|
|
1540 | return newob; |
|
|
1541 | } |
|
|
1542 | |
|
|
1543 | /* |
|
|
1544 | * decrease_ob_nr(object, number) decreases a specified number from |
1517 | * decrease(object, number) decreases a specified number from |
1545 | * the amount of an object. If the amount reaches 0, the object |
1518 | * the amount of an object. If the amount reaches 0, the object |
1546 | * is subsequently removed and freed. |
1519 | * is subsequently removed and freed. |
1547 | * |
1520 | * |
1548 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1521 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1549 | */ |
1522 | */ |
|
|
1523 | bool |
|
|
1524 | object::decrease (sint32 nr) |
|
|
1525 | { |
|
|
1526 | if (!nr) |
|
|
1527 | return true; |
|
|
1528 | |
|
|
1529 | nr = min (nr, nrof); |
|
|
1530 | |
|
|
1531 | if (nrof > nr) |
|
|
1532 | { |
|
|
1533 | nrof -= nr; |
|
|
1534 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1535 | |
|
|
1536 | if (object *pl = visible_to ()) |
|
|
1537 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1538 | |
|
|
1539 | return true; |
|
|
1540 | } |
|
|
1541 | else |
|
|
1542 | { |
|
|
1543 | destroy (); |
|
|
1544 | return false; |
|
|
1545 | } |
|
|
1546 | } |
|
|
1547 | |
|
|
1548 | /* |
|
|
1549 | * split(ob,nr) splits up ob into two parts. The part which |
|
|
1550 | * is returned contains nr objects, and the remaining parts contains |
|
|
1551 | * the rest (or is removed and returned if that number is 0). |
|
|
1552 | * On failure, NULL is returned. |
|
|
1553 | */ |
1550 | object * |
1554 | object * |
1551 | decrease_ob_nr (object *op, uint32 i) |
1555 | object::split (sint32 nr) |
1552 | { |
1556 | { |
1553 | object *tmp; |
1557 | int have = number_of (); |
1554 | |
1558 | |
1555 | if (i == 0) /* objects with op->nrof require this check */ |
1559 | if (have < nr) |
1556 | return op; |
1560 | return 0; |
1557 | |
1561 | else if (have == nr) |
1558 | if (i > op->nrof) |
|
|
1559 | i = op->nrof; |
|
|
1560 | |
|
|
1561 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1562 | op->nrof -= i; |
|
|
1563 | else if (op->env) |
|
|
1564 | { |
1562 | { |
1565 | /* is this object in the players inventory, or sub container |
|
|
1566 | * therein? |
|
|
1567 | */ |
|
|
1568 | tmp = op->in_player (); |
|
|
1569 | /* nope. Is this a container the player has opened? |
|
|
1570 | * If so, set tmp to that player. |
|
|
1571 | * IMO, searching through all the players will mostly |
|
|
1572 | * likely be quicker than following op->env to the map, |
|
|
1573 | * and then searching the map for a player. |
|
|
1574 | */ |
|
|
1575 | if (!tmp) |
|
|
1576 | for_all_players (pl) |
|
|
1577 | if (pl->ob->container == op->env) |
|
|
1578 | { |
|
|
1579 | tmp = pl->ob; |
|
|
1580 | break; |
|
|
1581 | } |
|
|
1582 | |
|
|
1583 | if (i < op->nrof) |
|
|
1584 | { |
|
|
1585 | sub_weight (op->env, op->weight * i); |
|
|
1586 | op->nrof -= i; |
|
|
1587 | if (tmp) |
|
|
1588 | esrv_send_item (tmp, op); |
|
|
1589 | } |
|
|
1590 | else |
|
|
1591 | { |
|
|
1592 | op->remove (); |
1563 | remove (); |
1593 | op->nrof = 0; |
1564 | return this; |
1594 | if (tmp) |
|
|
1595 | esrv_del_item (tmp->contr, op->count); |
|
|
1596 | } |
|
|
1597 | } |
1565 | } |
1598 | else |
1566 | else |
1599 | { |
1567 | { |
1600 | object *above = op->above; |
1568 | decrease (nr); |
1601 | |
1569 | |
1602 | if (i < op->nrof) |
1570 | object *op = deep_clone (); |
1603 | op->nrof -= i; |
1571 | op->nrof = nr; |
1604 | else |
|
|
1605 | { |
|
|
1606 | op->remove (); |
|
|
1607 | op->nrof = 0; |
|
|
1608 | } |
|
|
1609 | |
|
|
1610 | /* Since we just removed op, op->above is null */ |
|
|
1611 | for (tmp = above; tmp; tmp = tmp->above) |
|
|
1612 | if (tmp->type == PLAYER) |
|
|
1613 | { |
|
|
1614 | if (op->nrof) |
|
|
1615 | esrv_send_item (tmp, op); |
|
|
1616 | else |
|
|
1617 | esrv_del_item (tmp->contr, op->count); |
|
|
1618 | } |
|
|
1619 | } |
|
|
1620 | |
|
|
1621 | if (op->nrof) |
|
|
1622 | return op; |
1572 | return op; |
1623 | else |
|
|
1624 | { |
|
|
1625 | op->destroy (); |
|
|
1626 | return 0; |
|
|
1627 | } |
|
|
1628 | } |
|
|
1629 | |
|
|
1630 | /* |
|
|
1631 | * add_weight(object, weight) adds the specified weight to an object, |
|
|
1632 | * and also updates how much the environment(s) is/are carrying. |
|
|
1633 | */ |
|
|
1634 | void |
|
|
1635 | add_weight (object *op, signed long weight) |
|
|
1636 | { |
|
|
1637 | while (op != NULL) |
|
|
1638 | { |
|
|
1639 | if (op->type == CONTAINER) |
|
|
1640 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
1641 | |
|
|
1642 | op->carrying += weight; |
|
|
1643 | op = op->env; |
|
|
1644 | } |
1573 | } |
1645 | } |
1574 | } |
1646 | |
1575 | |
1647 | object * |
1576 | object * |
1648 | insert_ob_in_ob (object *op, object *where) |
1577 | insert_ob_in_ob (object *op, object *where) |
… | |
… | |
1673 | * be != op, if items are merged. -Tero |
1602 | * be != op, if items are merged. -Tero |
1674 | */ |
1603 | */ |
1675 | object * |
1604 | object * |
1676 | object::insert (object *op) |
1605 | object::insert (object *op) |
1677 | { |
1606 | { |
1678 | object *tmp, *otmp; |
|
|
1679 | |
|
|
1680 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1681 | op->remove (); |
|
|
1682 | |
|
|
1683 | if (op->more) |
1607 | if (op->more) |
1684 | { |
1608 | { |
1685 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1609 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1686 | return op; |
1610 | return op; |
1687 | } |
1611 | } |
1688 | |
1612 | |
1689 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1613 | op->remove (); |
1690 | CLEAR_FLAG (op, FLAG_REMOVED); |
1614 | |
|
|
1615 | op->flag [FLAG_OBJ_ORIGINAL] = 0; |
|
|
1616 | |
1691 | if (op->nrof) |
1617 | if (op->nrof) |
1692 | { |
|
|
1693 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1618 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1694 | if (object::can_merge (tmp, op)) |
1619 | if (object::can_merge (tmp, op)) |
1695 | { |
1620 | { |
1696 | /* return the original object and remove inserted object |
1621 | /* return the original object and remove inserted object |
1697 | (client needs the original object) */ |
1622 | (client needs the original object) */ |
1698 | tmp->nrof += op->nrof; |
1623 | tmp->nrof += op->nrof; |
1699 | /* Weight handling gets pretty funky. Since we are adding to |
1624 | |
1700 | * tmp->nrof, we need to increase the weight. |
1625 | if (object *pl = tmp->visible_to ()) |
1701 | */ |
1626 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1627 | |
1702 | add_weight (this, op->weight * op->nrof); |
1628 | adjust_weight (this, op->total_weight ()); |
1703 | SET_FLAG (op, FLAG_REMOVED); |
1629 | |
1704 | op->destroy (); /* free the inserted object */ |
1630 | op->destroy (1); |
1705 | op = tmp; |
1631 | op = tmp; |
1706 | op->remove (); /* and fix old object's links */ |
1632 | goto inserted; |
1707 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1708 | break; |
|
|
1709 | } |
1633 | } |
1710 | |
1634 | |
1711 | /* I assume combined objects have no inventory |
1635 | op->owner = 0; // it's his/hers now. period. |
1712 | * We add the weight - this object could have just been removed |
|
|
1713 | * (if it was possible to merge). calling remove_ob will subtract |
|
|
1714 | * the weight, so we need to add it in again, since we actually do |
|
|
1715 | * the linking below |
|
|
1716 | */ |
|
|
1717 | add_weight (this, op->weight * op->nrof); |
|
|
1718 | } |
|
|
1719 | else |
|
|
1720 | add_weight (this, (op->weight + op->carrying)); |
|
|
1721 | |
|
|
1722 | otmp = this->in_player (); |
|
|
1723 | if (otmp && otmp->contr) |
|
|
1724 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
|
|
1725 | otmp->update_stats (); |
|
|
1726 | |
|
|
1727 | op->map = 0; |
1636 | op->map = 0; |
1728 | op->env = this; |
1637 | op->x = 0; |
|
|
1638 | op->y = 0; |
|
|
1639 | |
1729 | op->above = 0; |
1640 | op->above = 0; |
1730 | op->below = 0; |
1641 | op->below = inv; |
1731 | op->x = 0, op->y = 0; |
1642 | op->env = this; |
1732 | |
1643 | |
|
|
1644 | if (inv) |
|
|
1645 | inv->above = op; |
|
|
1646 | |
|
|
1647 | inv = op; |
|
|
1648 | |
|
|
1649 | op->flag [FLAG_REMOVED] = 0; |
|
|
1650 | |
|
|
1651 | if (object *pl = op->visible_to ()) |
|
|
1652 | esrv_send_item (pl, op); |
|
|
1653 | |
|
|
1654 | adjust_weight (this, op->total_weight ()); |
|
|
1655 | |
|
|
1656 | inserted: |
1733 | /* reset the light list and los of the players on the map */ |
1657 | /* reset the light list and los of the players on the map */ |
1734 | if ((op->glow_radius != 0) && map) |
1658 | if (op->glow_radius && map && map->darkness) |
1735 | { |
|
|
1736 | #ifdef DEBUG_LIGHTS |
|
|
1737 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
|
|
1738 | #endif /* DEBUG_LIGHTS */ |
|
|
1739 | if (map->darkness) |
|
|
1740 | update_all_los (map, x, y); |
1659 | update_all_los (map, x, y); |
1741 | } |
|
|
1742 | |
1660 | |
1743 | /* Client has no idea of ordering so lets not bother ordering it here. |
1661 | // if this is a player's inventory, update stats |
1744 | * It sure simplifies this function... |
1662 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1745 | */ |
1663 | update_stats (); |
1746 | if (!inv) |
|
|
1747 | inv = op; |
|
|
1748 | else |
|
|
1749 | { |
|
|
1750 | op->below = inv; |
|
|
1751 | op->below->above = op; |
|
|
1752 | inv = op; |
|
|
1753 | } |
|
|
1754 | |
1664 | |
1755 | INVOKE_OBJECT (INSERT, this); |
1665 | INVOKE_OBJECT (INSERT, this); |
1756 | |
1666 | |
1757 | return op; |
1667 | return op; |
1758 | } |
1668 | } |
… | |
… | |
1886 | LOG (llevError, "Present_arch called outside map.\n"); |
1796 | LOG (llevError, "Present_arch called outside map.\n"); |
1887 | return NULL; |
1797 | return NULL; |
1888 | } |
1798 | } |
1889 | |
1799 | |
1890 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1800 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1891 | if (tmp->arch == at) |
1801 | if (tmp->arch->archname == at->archname) |
1892 | return tmp; |
1802 | return tmp; |
1893 | |
1803 | |
1894 | return NULL; |
1804 | return NULL; |
1895 | } |
1805 | } |
1896 | |
1806 | |
… | |
… | |
1960 | * The first matching object is returned, or NULL if none. |
1870 | * The first matching object is returned, or NULL if none. |
1961 | */ |
1871 | */ |
1962 | object * |
1872 | object * |
1963 | present_arch_in_ob (const archetype *at, const object *op) |
1873 | present_arch_in_ob (const archetype *at, const object *op) |
1964 | { |
1874 | { |
1965 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1875 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1966 | if (tmp->arch == at) |
1876 | if (tmp->arch->archname == at->archname) |
1967 | return tmp; |
1877 | return tmp; |
1968 | |
1878 | |
1969 | return NULL; |
1879 | return NULL; |
1970 | } |
1880 | } |
1971 | |
1881 | |
… | |
… | |
1973 | * activate recursively a flag on an object inventory |
1883 | * activate recursively a flag on an object inventory |
1974 | */ |
1884 | */ |
1975 | void |
1885 | void |
1976 | flag_inv (object *op, int flag) |
1886 | flag_inv (object *op, int flag) |
1977 | { |
1887 | { |
1978 | if (op->inv) |
|
|
1979 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1888 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1980 | { |
1889 | { |
1981 | SET_FLAG (tmp, flag); |
1890 | SET_FLAG (tmp, flag); |
1982 | flag_inv (tmp, flag); |
1891 | flag_inv (tmp, flag); |
1983 | } |
1892 | } |
1984 | } |
1893 | } |
1985 | |
1894 | |
1986 | /* |
1895 | /* |
1987 | * deactivate recursively a flag on an object inventory |
1896 | * deactivate recursively a flag on an object inventory |
1988 | */ |
1897 | */ |
1989 | void |
1898 | void |
1990 | unflag_inv (object *op, int flag) |
1899 | unflag_inv (object *op, int flag) |
1991 | { |
1900 | { |
1992 | if (op->inv) |
|
|
1993 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1901 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1994 | { |
1902 | { |
1995 | CLEAR_FLAG (tmp, flag); |
1903 | CLEAR_FLAG (tmp, flag); |
1996 | unflag_inv (tmp, flag); |
1904 | unflag_inv (tmp, flag); |
1997 | } |
1905 | } |
1998 | } |
1906 | } |
1999 | |
1907 | |
2000 | /* |
1908 | /* |
2001 | * find_free_spot(object, map, x, y, start, stop) will search for |
1909 | * find_free_spot(object, map, x, y, start, stop) will search for |
2002 | * a spot at the given map and coordinates which will be able to contain |
1910 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
2004 | * to search (see the freearr_x/y[] definition). |
1912 | * to search (see the freearr_x/y[] definition). |
2005 | * It returns a random choice among the alternatives found. |
1913 | * It returns a random choice among the alternatives found. |
2006 | * start and stop are where to start relative to the free_arr array (1,9 |
1914 | * start and stop are where to start relative to the free_arr array (1,9 |
2007 | * does all 4 immediate directions). This returns the index into the |
1915 | * does all 4 immediate directions). This returns the index into the |
2008 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1916 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
2009 | * Note - this only checks to see if there is space for the head of the |
|
|
2010 | * object - if it is a multispace object, this should be called for all |
|
|
2011 | * pieces. |
|
|
2012 | * Note2: This function does correctly handle tiled maps, but does not |
1917 | * Note: This function does correctly handle tiled maps, but does not |
2013 | * inform the caller. However, insert_ob_in_map will update as |
1918 | * inform the caller. However, insert_ob_in_map will update as |
2014 | * necessary, so the caller shouldn't need to do any special work. |
1919 | * necessary, so the caller shouldn't need to do any special work. |
2015 | * Note - updated to take an object instead of archetype - this is necessary |
1920 | * Note - updated to take an object instead of archetype - this is necessary |
2016 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1921 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2017 | * to know if the space in question will block the object. We can't use |
1922 | * to know if the space in question will block the object. We can't use |
… | |
… | |
2019 | * customized, changed states, etc. |
1924 | * customized, changed states, etc. |
2020 | */ |
1925 | */ |
2021 | int |
1926 | int |
2022 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1927 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2023 | { |
1928 | { |
|
|
1929 | int altern[SIZEOFFREE]; |
2024 | int index = 0, flag; |
1930 | int index = 0, flag; |
2025 | int altern[SIZEOFFREE]; |
|
|
2026 | |
1931 | |
2027 | for (int i = start; i < stop; i++) |
1932 | for (int i = start; i < stop; i++) |
2028 | { |
1933 | { |
2029 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1934 | mapxy pos (m, x, y); pos.move (i); |
2030 | if (!flag) |
1935 | |
|
|
1936 | if (!pos.normalise ()) |
|
|
1937 | continue; |
|
|
1938 | |
|
|
1939 | mapspace &ms = *pos; |
|
|
1940 | |
|
|
1941 | if (ms.flags () & P_IS_ALIVE) |
|
|
1942 | continue; |
|
|
1943 | |
|
|
1944 | /* However, often |
|
|
1945 | * ob doesn't have any move type (when used to place exits) |
|
|
1946 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
1947 | */ |
|
|
1948 | if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
1949 | { |
2031 | altern [index++] = i; |
1950 | altern [index++] = i; |
|
|
1951 | continue; |
|
|
1952 | } |
2032 | |
1953 | |
2033 | /* Basically, if we find a wall on a space, we cut down the search size. |
1954 | /* Basically, if we find a wall on a space, we cut down the search size. |
2034 | * In this way, we won't return spaces that are on another side of a wall. |
1955 | * In this way, we won't return spaces that are on another side of a wall. |
2035 | * This mostly work, but it cuts down the search size in all directions - |
1956 | * This mostly work, but it cuts down the search size in all directions - |
2036 | * if the space being examined only has a wall to the north and empty |
1957 | * if the space being examined only has a wall to the north and empty |
2037 | * spaces in all the other directions, this will reduce the search space |
1958 | * spaces in all the other directions, this will reduce the search space |
2038 | * to only the spaces immediately surrounding the target area, and |
1959 | * to only the spaces immediately surrounding the target area, and |
2039 | * won't look 2 spaces south of the target space. |
1960 | * won't look 2 spaces south of the target space. |
2040 | */ |
1961 | */ |
2041 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
1962 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
1963 | { |
2042 | stop = maxfree[i]; |
1964 | stop = maxfree[i]; |
|
|
1965 | continue; |
|
|
1966 | } |
|
|
1967 | |
|
|
1968 | /* Note it is intentional that we check ob - the movement type of the |
|
|
1969 | * head of the object should correspond for the entire object. |
|
|
1970 | */ |
|
|
1971 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
1972 | continue; |
|
|
1973 | |
|
|
1974 | if (ob->blocked (m, pos.x, pos.y)) |
|
|
1975 | continue; |
|
|
1976 | |
|
|
1977 | altern [index++] = i; |
2043 | } |
1978 | } |
2044 | |
1979 | |
2045 | if (!index) |
1980 | if (!index) |
2046 | return -1; |
1981 | return -1; |
2047 | |
1982 | |
… | |
… | |
2056 | */ |
1991 | */ |
2057 | int |
1992 | int |
2058 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
1993 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2059 | { |
1994 | { |
2060 | for (int i = 0; i < SIZEOFFREE; i++) |
1995 | for (int i = 0; i < SIZEOFFREE; i++) |
2061 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
1996 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2062 | return i; |
1997 | return i; |
2063 | |
1998 | |
2064 | return -1; |
1999 | return -1; |
2065 | } |
2000 | } |
2066 | |
2001 | |
… | |
… | |
2343 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2278 | * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause |
2344 | * core dumps if they do. |
2279 | * core dumps if they do. |
2345 | * |
2280 | * |
2346 | * Add a check so we can't pick up invisible objects (0.93.8) |
2281 | * Add a check so we can't pick up invisible objects (0.93.8) |
2347 | */ |
2282 | */ |
2348 | |
|
|
2349 | int |
2283 | int |
2350 | can_pick (const object *who, const object *item) |
2284 | can_pick (const object *who, const object *item) |
2351 | { |
2285 | { |
2352 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2286 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2353 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2287 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
… | |
… | |
2356 | |
2290 | |
2357 | /* |
2291 | /* |
2358 | * create clone from object to another |
2292 | * create clone from object to another |
2359 | */ |
2293 | */ |
2360 | object * |
2294 | object * |
2361 | object_create_clone (object *asrc) |
2295 | object::deep_clone () |
2362 | { |
2296 | { |
2363 | object *dst = 0, *tmp, *src, *prev, *item; |
2297 | assert (("deep_clone called on non-head object", is_head ())); |
2364 | |
2298 | |
2365 | if (!asrc) |
2299 | object *dst = clone (); |
2366 | return 0; |
|
|
2367 | |
2300 | |
2368 | src = asrc->head_ (); |
2301 | object *prev = dst; |
2369 | |
|
|
2370 | prev = 0; |
|
|
2371 | for (object *part = src; part; part = part->more) |
2302 | for (object *part = this->more; part; part = part->more) |
2372 | { |
2303 | { |
2373 | tmp = part->clone (); |
2304 | object *tmp = part->clone (); |
2374 | tmp->x -= src->x; |
|
|
2375 | tmp->y -= src->y; |
|
|
2376 | |
|
|
2377 | if (!part->head) |
|
|
2378 | { |
|
|
2379 | dst = tmp; |
|
|
2380 | tmp->head = 0; |
|
|
2381 | } |
|
|
2382 | else |
|
|
2383 | tmp->head = dst; |
2305 | tmp->head = dst; |
2384 | |
|
|
2385 | tmp->more = 0; |
|
|
2386 | |
|
|
2387 | if (prev) |
|
|
2388 | prev->more = tmp; |
2306 | prev->more = tmp; |
2389 | |
|
|
2390 | prev = tmp; |
2307 | prev = tmp; |
2391 | } |
2308 | } |
2392 | |
2309 | |
2393 | for (item = src->inv; item; item = item->below) |
2310 | for (object *item = inv; item; item = item->below) |
2394 | insert_ob_in_ob (object_create_clone (item), dst); |
2311 | insert_ob_in_ob (item->deep_clone (), dst); |
2395 | |
2312 | |
2396 | return dst; |
2313 | return dst; |
2397 | } |
2314 | } |
2398 | |
2315 | |
2399 | /* This returns the first object in who's inventory that |
2316 | /* This returns the first object in who's inventory that |
… | |
… | |
2408 | return tmp; |
2325 | return tmp; |
2409 | |
2326 | |
2410 | return 0; |
2327 | return 0; |
2411 | } |
2328 | } |
2412 | |
2329 | |
2413 | /* If ob has a field named key, return the link from the list, |
2330 | const shstr & |
2414 | * otherwise return NULL. |
2331 | object::kv_get (const shstr &key) const |
2415 | * |
|
|
2416 | * key must be a passed in shared string - otherwise, this won't |
|
|
2417 | * do the desired thing. |
|
|
2418 | */ |
|
|
2419 | key_value * |
|
|
2420 | get_ob_key_link (const object *ob, const char *key) |
|
|
2421 | { |
2332 | { |
2422 | for (key_value *link = ob->key_values; link; link = link->next) |
2333 | for (key_value *kv = key_values; kv; kv = kv->next) |
2423 | if (link->key == key) |
2334 | if (kv->key == key) |
2424 | return link; |
|
|
2425 | |
|
|
2426 | return 0; |
|
|
2427 | } |
|
|
2428 | |
|
|
2429 | /* |
|
|
2430 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2431 | * |
|
|
2432 | * The argument doesn't need to be a shared string. |
|
|
2433 | * |
|
|
2434 | * The returned string is shared. |
|
|
2435 | */ |
|
|
2436 | const char * |
|
|
2437 | get_ob_key_value (const object *op, const char *const key) |
|
|
2438 | { |
|
|
2439 | key_value *link; |
|
|
2440 | shstr_cmp canonical_key (key); |
|
|
2441 | |
|
|
2442 | if (!canonical_key) |
|
|
2443 | { |
|
|
2444 | /* 1. There being a field named key on any object |
|
|
2445 | * implies there'd be a shared string to find. |
|
|
2446 | * 2. Since there isn't, no object has this field. |
|
|
2447 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2448 | */ |
|
|
2449 | return 0; |
|
|
2450 | } |
|
|
2451 | |
|
|
2452 | /* This is copied from get_ob_key_link() above - |
|
|
2453 | * only 4 lines, and saves the function call overhead. |
|
|
2454 | */ |
|
|
2455 | for (link = op->key_values; link; link = link->next) |
|
|
2456 | if (link->key == canonical_key) |
|
|
2457 | return link->value; |
2335 | return kv->value; |
2458 | |
2336 | |
2459 | return 0; |
2337 | return shstr_null; |
2460 | } |
2338 | } |
2461 | |
2339 | |
2462 | /* |
2340 | void |
2463 | * Updates the canonical_key in op to value. |
2341 | object::kv_set (const shstr &key, const shstr &value) |
2464 | * |
|
|
2465 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2466 | * |
|
|
2467 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2468 | * keys. |
|
|
2469 | * |
|
|
2470 | * Returns TRUE on success. |
|
|
2471 | */ |
|
|
2472 | int |
|
|
2473 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2474 | { |
2342 | { |
2475 | key_value *field = NULL, *last = NULL; |
2343 | for (key_value *kv = key_values; kv; kv = kv->next) |
2476 | |
2344 | if (kv->key == key) |
2477 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2478 | { |
|
|
2479 | if (field->key != canonical_key) |
|
|
2480 | { |
2345 | { |
2481 | last = field; |
2346 | kv->value = value; |
2482 | continue; |
2347 | return; |
2483 | } |
2348 | } |
2484 | |
2349 | |
2485 | if (value) |
2350 | key_value *kv = new key_value; |
2486 | field->value = value; |
2351 | |
2487 | else |
2352 | kv->next = key_values; |
|
|
2353 | kv->key = key; |
|
|
2354 | kv->value = value; |
|
|
2355 | |
|
|
2356 | key_values = kv; |
|
|
2357 | } |
|
|
2358 | |
|
|
2359 | void |
|
|
2360 | object::kv_del (const shstr &key) |
|
|
2361 | { |
|
|
2362 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2363 | if ((*kvp)->key == key) |
2488 | { |
2364 | { |
2489 | /* Basically, if the archetype has this key set, |
2365 | key_value *kv = *kvp; |
2490 | * we need to store the null value so when we save |
2366 | *kvp = (*kvp)->next; |
2491 | * it, we save the empty value so that when we load, |
2367 | delete kv; |
2492 | * we get this value back again. |
2368 | return; |
2493 | */ |
|
|
2494 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2495 | field->value = 0; |
|
|
2496 | else |
|
|
2497 | { |
|
|
2498 | if (last) |
|
|
2499 | last->next = field->next; |
|
|
2500 | else |
|
|
2501 | op->key_values = field->next; |
|
|
2502 | |
|
|
2503 | delete field; |
|
|
2504 | } |
|
|
2505 | } |
2369 | } |
2506 | return TRUE; |
|
|
2507 | } |
|
|
2508 | /* IF we get here, key doesn't exist */ |
|
|
2509 | |
|
|
2510 | /* No field, we'll have to add it. */ |
|
|
2511 | |
|
|
2512 | if (!add_key) |
|
|
2513 | return FALSE; |
|
|
2514 | |
|
|
2515 | /* There isn't any good reason to store a null |
|
|
2516 | * value in the key/value list. If the archetype has |
|
|
2517 | * this key, then we should also have it, so shouldn't |
|
|
2518 | * be here. If user wants to store empty strings, |
|
|
2519 | * should pass in "" |
|
|
2520 | */ |
|
|
2521 | if (value == NULL) |
|
|
2522 | return TRUE; |
|
|
2523 | |
|
|
2524 | field = new key_value; |
|
|
2525 | |
|
|
2526 | field->key = canonical_key; |
|
|
2527 | field->value = value; |
|
|
2528 | /* Usual prepend-addition. */ |
|
|
2529 | field->next = op->key_values; |
|
|
2530 | op->key_values = field; |
|
|
2531 | |
|
|
2532 | return TRUE; |
|
|
2533 | } |
|
|
2534 | |
|
|
2535 | /* |
|
|
2536 | * Updates the key in op to value. |
|
|
2537 | * |
|
|
2538 | * If add_key is FALSE, this will only update existing keys, |
|
|
2539 | * and not add new ones. |
|
|
2540 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2541 | * |
|
|
2542 | * Returns TRUE on success. |
|
|
2543 | */ |
|
|
2544 | int |
|
|
2545 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2546 | { |
|
|
2547 | shstr key_ (key); |
|
|
2548 | |
|
|
2549 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2550 | } |
2370 | } |
2551 | |
2371 | |
2552 | object::depth_iterator::depth_iterator (object *container) |
2372 | object::depth_iterator::depth_iterator (object *container) |
2553 | : iterator_base (container) |
2373 | : iterator_base (container) |
2554 | { |
2374 | { |
… | |
… | |
2604 | { |
2424 | { |
2605 | char flagdesc[512]; |
2425 | char flagdesc[512]; |
2606 | char info2[256 * 4]; |
2426 | char info2[256 * 4]; |
2607 | char *p = info; |
2427 | char *p = info; |
2608 | |
2428 | |
2609 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2429 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2610 | count, uuid.seq, |
2430 | count, |
|
|
2431 | uuid.c_str (), |
2611 | &name, |
2432 | &name, |
2612 | title ? "\",title:\"" : "", |
2433 | title ? ",title:\"" : "", |
2613 | title ? (const char *)title : "", |
2434 | title ? (const char *)title : "", |
|
|
2435 | title ? "\"" : "", |
2614 | flag_desc (flagdesc, 512), type); |
2436 | flag_desc (flagdesc, 512), type); |
2615 | |
2437 | |
2616 | if (env) |
2438 | if (!flag[FLAG_REMOVED] && env) |
2617 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2439 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2618 | |
2440 | |
2619 | if (map) |
2441 | if (map) |
2620 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2442 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2621 | |
2443 | |
… | |
… | |
2651 | object::open_container (object *new_container) |
2473 | object::open_container (object *new_container) |
2652 | { |
2474 | { |
2653 | if (container == new_container) |
2475 | if (container == new_container) |
2654 | return; |
2476 | return; |
2655 | |
2477 | |
2656 | if (object *old_container = container) |
2478 | object *old_container = container; |
|
|
2479 | |
|
|
2480 | if (old_container) |
2657 | { |
2481 | { |
2658 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2482 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2659 | return; |
2483 | return; |
2660 | |
2484 | |
2661 | #if 0 |
2485 | #if 0 |
… | |
… | |
2663 | if (object *closer = old_container->inv) |
2487 | if (object *closer = old_container->inv) |
2664 | if (closer->type == CLOSE_CON) |
2488 | if (closer->type == CLOSE_CON) |
2665 | closer->destroy (); |
2489 | closer->destroy (); |
2666 | #endif |
2490 | #endif |
2667 | |
2491 | |
|
|
2492 | // make sure the container is available |
|
|
2493 | esrv_send_item (this, old_container); |
|
|
2494 | |
2668 | old_container->flag [FLAG_APPLIED] = 0; |
2495 | old_container->flag [FLAG_APPLIED] = false; |
2669 | container = 0; |
2496 | container = 0; |
2670 | |
2497 | |
|
|
2498 | // client needs item update to make it work, client bug requires this to be separate |
2671 | esrv_update_item (UPD_FLAGS, this, old_container); |
2499 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2500 | |
2672 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2501 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2502 | play_sound (sound_find ("chest_close")); |
2673 | } |
2503 | } |
2674 | |
2504 | |
2675 | if (new_container) |
2505 | if (new_container) |
2676 | { |
2506 | { |
2677 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
2507 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
… | |
… | |
2688 | } |
2518 | } |
2689 | #endif |
2519 | #endif |
2690 | |
2520 | |
2691 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2521 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2692 | |
2522 | |
|
|
2523 | // make sure the container is available, client bug requires this to be separate |
|
|
2524 | esrv_send_item (this, new_container); |
|
|
2525 | |
2693 | new_container->flag [FLAG_APPLIED] = 1; |
2526 | new_container->flag [FLAG_APPLIED] = true; |
2694 | container = new_container; |
2527 | container = new_container; |
2695 | |
2528 | |
|
|
2529 | // client needs flag change |
2696 | esrv_update_item (UPD_FLAGS, this, new_container); |
2530 | esrv_update_item (UPD_FLAGS, this, new_container); |
2697 | esrv_send_inventory (this, new_container); |
2531 | esrv_send_inventory (this, new_container); |
|
|
2532 | play_sound (sound_find ("chest_open")); |
2698 | } |
2533 | } |
|
|
2534 | // else if (!old_container->env && contr && contr->ns) |
|
|
2535 | // contr->ns->floorbox_reset (); |
2699 | } |
2536 | } |
2700 | |
2537 | |
2701 | object * |
2538 | object * |
2702 | object::force_find (const shstr name) |
2539 | object::force_find (const shstr name) |
2703 | { |
2540 | { |
… | |
… | |
2728 | force->flag [FLAG_APPLIED] = true; |
2565 | force->flag [FLAG_APPLIED] = true; |
2729 | |
2566 | |
2730 | insert (force); |
2567 | insert (force); |
2731 | } |
2568 | } |
2732 | |
2569 | |
|
|
2570 | void |
|
|
2571 | object::play_sound (faceidx sound) |
|
|
2572 | { |
|
|
2573 | if (!sound) |
|
|
2574 | return; |
2733 | |
2575 | |
|
|
2576 | if (flag [FLAG_REMOVED]) |
|
|
2577 | return; |
|
|
2578 | |
|
|
2579 | if (env) |
|
|
2580 | { |
|
|
2581 | if (object *pl = in_player ()) |
|
|
2582 | pl->contr->play_sound (sound); |
|
|
2583 | } |
|
|
2584 | else |
|
|
2585 | map->play_sound (sound, x, y); |
|
|
2586 | } |
|
|
2587 | |