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 |
191 | /* Do not merge objects if nrof would overflow. First part checks |
208 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
192 | * for unsigned overflow (2c), second part checks whether the result |
209 | * value could not be stored in a sint32 (which unfortunately sometimes is |
193 | * would fit into a 32 bit signed int, which is often used to hold |
210 | * used to store nrof). |
194 | * nrof values. |
211 | */ |
195 | */ |
212 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
213 | return 0; |
197 | return 0; |
214 | |
198 | |
215 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
199 | /* 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 |
200 | * 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 |
201 | * 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 |
202 | * are not equal - just if it has been identified, the been_applied |
219 | * flags lose any meaning. |
203 | * flags lose any meaning. |
220 | */ |
204 | */ |
221 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
205 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
222 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
223 | |
207 | |
224 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
225 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
226 | |
210 | |
227 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
211 | if (ob1->arch->name != ob2->arch->name |
228 | || ob1->arch != ob2->arch |
|
|
229 | || ob1->name != ob2->name |
212 | || ob1->name != ob2->name |
230 | || ob1->title != ob2->title |
213 | || ob1->title != ob2->title |
231 | || ob1->msg != ob2->msg |
214 | || ob1->msg != ob2->msg |
232 | || ob1->weight != ob2->weight |
215 | || 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 |
216 | || ob1->attacktype != ob2->attacktype |
236 | || ob1->magic != ob2->magic |
217 | || ob1->magic != ob2->magic |
237 | || ob1->slaying != ob2->slaying |
218 | || ob1->slaying != ob2->slaying |
238 | || ob1->skill != ob2->skill |
219 | || ob1->skill != ob2->skill |
239 | || ob1->value != ob2->value |
220 | || ob1->value != ob2->value |
… | |
… | |
246 | || ob1->move_block != ob2->move_block |
227 | || ob1->move_block != ob2->move_block |
247 | || ob1->move_allow != ob2->move_allow |
228 | || ob1->move_allow != ob2->move_allow |
248 | || ob1->move_on != ob2->move_on |
229 | || ob1->move_on != ob2->move_on |
249 | || ob1->move_off != ob2->move_off |
230 | || ob1->move_off != ob2->move_off |
250 | || ob1->move_slow != ob2->move_slow |
231 | || ob1->move_slow != ob2->move_slow |
251 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
232 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
|
|
233 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
|
|
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
252 | return 0; |
235 | return 0; |
253 | |
236 | |
|
|
237 | if ((ob1->flag ^ ob2->flag) |
|
|
238 | .reset (FLAG_INV_LOCKED) |
|
|
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
|
|
241 | .any ()) |
|
|
242 | return 0; |
|
|
243 | |
254 | /* This is really a spellbook check - really, we should |
244 | /* This is really a spellbook check - we should in general |
255 | * check all objects in the inventory. |
245 | * not merge objects with real inventories, as splitting them |
|
|
246 | * is hard. |
256 | */ |
247 | */ |
257 | if (ob1->inv || ob2->inv) |
248 | if (ob1->inv || ob2->inv) |
258 | { |
249 | { |
259 | /* if one object has inventory but the other doesn't, not equiv */ |
250 | if (!(ob1->inv && ob2->inv)) |
260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
251 | return 0; /* inventories differ in length */ |
261 | return 0; |
|
|
262 | |
252 | |
263 | /* Now check to see if the two inventory objects could merge */ |
253 | if (ob1->inv->below || ob2->inv->below) |
|
|
254 | return 0; /* more than one object in inv */ |
|
|
255 | |
264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
256 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | return 0; |
257 | return 0; /* inventory objects differ */ |
266 | |
258 | |
267 | /* inventory ok - still need to check rest of this object to see |
259 | /* inventory ok - still need to check rest of this object to see |
268 | * if it is valid. |
260 | * if it is valid. |
269 | */ |
261 | */ |
270 | } |
262 | } |
… | |
… | |
289 | if (ob1->level != ob2->level) |
281 | if (ob1->level != ob2->level) |
290 | return 0; |
282 | return 0; |
291 | break; |
283 | break; |
292 | } |
284 | } |
293 | |
285 | |
294 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
286 | if (ob1->key_values || ob2->key_values) |
295 | { |
287 | { |
296 | /* At least one of these has key_values. */ |
288 | /* At least one of these has key_values. */ |
297 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) |
289 | if ((!ob1->key_values) != (!ob2->key_values)) |
298 | /* One has fields, but the other one doesn't. */ |
290 | return 0; /* One has fields, but the other one doesn't. */ |
299 | return 0; |
291 | |
300 | else if (!compare_ob_value_lists (ob1, ob2)) |
292 | if (!compare_ob_value_lists (ob1, ob2)) |
301 | return 0; |
293 | return 0; |
302 | } |
294 | } |
303 | |
295 | |
304 | if (ob1->self || ob2->self) |
296 | if (ob1->self || ob2->self) |
305 | { |
297 | { |
306 | ob1->optimise (); |
298 | ob1->optimise (); |
307 | ob2->optimise (); |
299 | ob2->optimise (); |
308 | |
300 | |
309 | if (ob1->self || ob2->self) |
301 | if (ob1->self || ob2->self) |
|
|
302 | { |
|
|
303 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
|
|
304 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
|
|
305 | |
|
|
306 | if (k1 != k2) |
|
|
307 | return 0; |
|
|
308 | |
|
|
309 | if (k1 == 0) |
|
|
310 | return 1; |
|
|
311 | |
310 | if (!cfperl_can_merge (ob1, ob2)) |
312 | if (!cfperl_can_merge (ob1, ob2)) |
311 | return 0; |
313 | return 0; |
|
|
314 | } |
312 | } |
315 | } |
313 | |
316 | |
314 | /* Everything passes, must be OK. */ |
317 | /* Everything passes, must be OK. */ |
315 | return 1; |
318 | return 1; |
316 | } |
319 | } |
317 | |
320 | |
|
|
321 | // find player who can see this object |
|
|
322 | object * |
|
|
323 | object::visible_to () const |
|
|
324 | { |
|
|
325 | if (client_visible () && !flag [FLAG_REMOVED]) |
|
|
326 | { |
|
|
327 | // see if we are in a container of sorts |
|
|
328 | if (env) |
|
|
329 | { |
|
|
330 | // the player inventory itself is always visible |
|
|
331 | if (env->type == PLAYER) |
|
|
332 | return env; |
|
|
333 | |
|
|
334 | // else a player could have our env open |
|
|
335 | object *envest = env->outer_env (); |
|
|
336 | |
|
|
337 | // the player itself is always on a map, so we will find him here |
|
|
338 | // even if our inv is in a player. |
|
|
339 | if (envest->is_on_map ()) |
|
|
340 | if (object *pl = envest->ms ().player ()) |
|
|
341 | if (pl->container == env) |
|
|
342 | return pl; |
|
|
343 | } |
|
|
344 | else |
|
|
345 | { |
|
|
346 | // maybe there is a player standing on the same mapspace |
|
|
347 | // this will catch the case where "this" is a player |
|
|
348 | if (object *pl = ms ().player ()) |
|
|
349 | if (!pl->container || this == pl->container) |
|
|
350 | return pl; |
|
|
351 | } |
|
|
352 | } |
|
|
353 | |
|
|
354 | return 0; |
|
|
355 | } |
|
|
356 | |
|
|
357 | // adjust weight per container type ("of holding") |
|
|
358 | static sint32 |
|
|
359 | weight_adjust_for (object *op, sint32 weight) |
|
|
360 | { |
|
|
361 | return op->type == CONTAINER |
|
|
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
|
|
363 | : weight; |
|
|
364 | } |
|
|
365 | |
318 | /* |
366 | /* |
|
|
367 | * adjust_weight(object, weight) adds the specified weight to an object, |
|
|
368 | * and also updates how much the environment(s) is/are carrying. |
|
|
369 | */ |
|
|
370 | static void |
|
|
371 | adjust_weight (object *op, sint32 weight) |
|
|
372 | { |
|
|
373 | while (op) |
|
|
374 | { |
|
|
375 | // adjust by actual difference to account for rounding errors |
|
|
376 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
|
|
377 | weight = weight_adjust_for (op, op->carrying) |
|
|
378 | - weight_adjust_for (op, op->carrying - weight); |
|
|
379 | |
|
|
380 | if (!weight) |
|
|
381 | return; |
|
|
382 | |
|
|
383 | op->carrying += weight; |
|
|
384 | |
|
|
385 | if (object *pl = op->visible_to ()) |
|
|
386 | if (pl != op) // player is handled lazily |
|
|
387 | esrv_update_item (UPD_WEIGHT, pl, op); |
|
|
388 | |
|
|
389 | op = op->env; |
|
|
390 | } |
|
|
391 | } |
|
|
392 | |
|
|
393 | /* |
319 | * sum_weight() is a recursive function which calculates the weight |
394 | * this is a recursive function which calculates the weight |
320 | * an object is carrying. It goes through in figures out how much |
395 | * an object is carrying. It goes through op and figures out how much |
321 | * containers are carrying, and sums it up. |
396 | * containers are carrying, and sums it up. |
322 | */ |
397 | */ |
323 | long |
398 | void |
324 | sum_weight (object *op) |
399 | object::update_weight () |
325 | { |
400 | { |
326 | long sum; |
401 | sint32 sum = 0; |
327 | object *inv; |
|
|
328 | |
402 | |
329 | for (sum = 0, inv = op->inv; inv; inv = inv->below) |
403 | for (object *op = inv; op; op = op->below) |
330 | { |
404 | { |
331 | if (inv->inv) |
405 | if (op->inv) |
332 | sum_weight (inv); |
406 | op->update_weight (); |
333 | |
407 | |
334 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
408 | sum += op->total_weight (); |
|
|
409 | } |
|
|
410 | |
|
|
411 | sum = weight_adjust (this, sum); |
|
|
412 | |
|
|
413 | if (sum != carrying) |
335 | } |
414 | { |
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; |
415 | carrying = sum; |
342 | |
416 | |
343 | return sum; |
417 | if (object *pl = visible_to ()) |
|
|
418 | if (pl != this) // player is handled lazily |
|
|
419 | esrv_update_item (UPD_WEIGHT, pl, this); |
|
|
420 | } |
344 | } |
421 | } |
345 | |
422 | |
346 | /** |
423 | /* |
347 | * Return the outermost environment object for a given object. |
424 | * 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 | */ |
425 | */ |
363 | char * |
426 | char * |
364 | dump_object (object *op) |
427 | dump_object (object *op) |
365 | { |
428 | { |
366 | if (!op) |
429 | if (!op) |
… | |
… | |
380 | get_nearest_part (object *op, const object *pl) |
443 | get_nearest_part (object *op, const object *pl) |
381 | { |
444 | { |
382 | object *tmp, *closest; |
445 | object *tmp, *closest; |
383 | int last_dist, i; |
446 | int last_dist, i; |
384 | |
447 | |
385 | if (op->more == NULL) |
448 | if (!op->more) |
386 | return op; |
449 | return op; |
|
|
450 | |
387 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
451 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
452 | tmp; |
|
|
453 | tmp = tmp->more) |
388 | if ((i = distance (tmp, pl)) < last_dist) |
454 | if ((i = distance (tmp, pl)) < last_dist) |
389 | closest = tmp, last_dist = i; |
455 | closest = tmp, last_dist = i; |
|
|
456 | |
390 | return closest; |
457 | return closest; |
391 | } |
458 | } |
392 | |
459 | |
393 | /* |
460 | /* |
394 | * Returns the object which has the count-variable equal to the argument. |
461 | * Returns the object which has the count-variable equal to the argument. |
|
|
462 | * VERRRY slow. |
395 | */ |
463 | */ |
396 | object * |
464 | object * |
397 | find_object (tag_t i) |
465 | find_object (tag_t i) |
398 | { |
466 | { |
399 | for_all_objects (op) |
467 | for_all_objects (op) |
… | |
… | |
417 | for_all_objects (op) |
485 | for_all_objects (op) |
418 | if (op->name == str_) |
486 | if (op->name == str_) |
419 | break; |
487 | break; |
420 | |
488 | |
421 | return op; |
489 | return op; |
422 | } |
|
|
423 | |
|
|
424 | void |
|
|
425 | free_all_object_data () |
|
|
426 | { |
|
|
427 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
|
|
428 | } |
490 | } |
429 | |
491 | |
430 | /* |
492 | /* |
431 | * Sets the owner and sets the skill and exp pointers to owner's current |
493 | * Sets the owner and sets the skill and exp pointers to owner's current |
432 | * skill and experience objects. |
494 | * skill and experience objects. |
… | |
… | |
437 | { |
499 | { |
438 | // allow objects which own objects |
500 | // allow objects which own objects |
439 | if (owner) |
501 | if (owner) |
440 | while (owner->owner) |
502 | while (owner->owner) |
441 | owner = owner->owner; |
503 | owner = owner->owner; |
|
|
504 | |
|
|
505 | if (flag [FLAG_FREED]) |
|
|
506 | { |
|
|
507 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
|
|
508 | return; |
|
|
509 | } |
442 | |
510 | |
443 | this->owner = owner; |
511 | this->owner = owner; |
444 | } |
512 | } |
445 | |
513 | |
446 | int |
514 | int |
… | |
… | |
524 | } |
592 | } |
525 | |
593 | |
526 | op->key_values = 0; |
594 | op->key_values = 0; |
527 | } |
595 | } |
528 | |
596 | |
529 | object & |
597 | /* |
530 | object::operator =(const object &src) |
598 | * copy_to first frees everything allocated by the dst object, |
|
|
599 | * and then copies the contents of itself into the second |
|
|
600 | * object, allocating what needs to be allocated. Basically, any |
|
|
601 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
602 | * if the first object is freed, the pointers in the new object |
|
|
603 | * will point at garbage. |
|
|
604 | */ |
|
|
605 | void |
|
|
606 | object::copy_to (object *dst) |
531 | { |
607 | { |
532 | bool is_freed = flag [FLAG_FREED]; |
608 | dst->remove (); |
533 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
534 | |
|
|
535 | *(object_copy *)this = src; |
609 | *(object_copy *)dst = *this; |
536 | |
|
|
537 | flag [FLAG_FREED] = is_freed; |
|
|
538 | flag [FLAG_REMOVED] = is_removed; |
610 | dst->flag [FLAG_REMOVED] = true; |
539 | |
611 | |
540 | /* Copy over key_values, if any. */ |
612 | /* Copy over key_values, if any. */ |
541 | if (src.key_values) |
613 | if (key_values) |
542 | { |
614 | { |
543 | key_value *tail = 0; |
615 | key_value *tail = 0; |
544 | key_values = 0; |
616 | dst->key_values = 0; |
545 | |
617 | |
546 | for (key_value *i = src.key_values; i; i = i->next) |
618 | for (key_value *i = key_values; i; i = i->next) |
547 | { |
619 | { |
548 | key_value *new_link = new key_value; |
620 | key_value *new_link = new key_value; |
549 | |
621 | |
550 | new_link->next = 0; |
622 | new_link->next = 0; |
551 | new_link->key = i->key; |
623 | new_link->key = i->key; |
552 | new_link->value = i->value; |
624 | new_link->value = i->value; |
553 | |
625 | |
554 | /* Try and be clever here, too. */ |
626 | /* Try and be clever here, too. */ |
555 | if (!key_values) |
627 | if (!dst->key_values) |
556 | { |
628 | { |
557 | key_values = new_link; |
629 | dst->key_values = new_link; |
558 | tail = new_link; |
630 | tail = new_link; |
559 | } |
631 | } |
560 | else |
632 | else |
561 | { |
633 | { |
562 | tail->next = new_link; |
634 | tail->next = new_link; |
563 | tail = new_link; |
635 | tail = new_link; |
564 | } |
636 | } |
565 | } |
637 | } |
566 | } |
638 | } |
567 | } |
|
|
568 | |
|
|
569 | /* |
|
|
570 | * copy_to first frees everything allocated by the dst object, |
|
|
571 | * and then copies the contents of itself into the second |
|
|
572 | * object, allocating what needs to be allocated. Basically, any |
|
|
573 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
574 | * if the first object is freed, the pointers in the new object |
|
|
575 | * will point at garbage. |
|
|
576 | */ |
|
|
577 | void |
|
|
578 | object::copy_to (object *dst) |
|
|
579 | { |
|
|
580 | *dst = *this; |
|
|
581 | |
639 | |
582 | if (speed < 0) |
640 | if (speed < 0) |
583 | dst->speed_left -= rndm (); |
641 | dst->speed_left -= rndm (); |
584 | |
642 | |
585 | dst->set_speed (dst->speed); |
643 | dst->set_speed (dst->speed); |
… | |
… | |
587 | |
645 | |
588 | void |
646 | void |
589 | object::instantiate () |
647 | object::instantiate () |
590 | { |
648 | { |
591 | if (!uuid.seq) // HACK |
649 | if (!uuid.seq) // HACK |
592 | uuid = gen_uuid (); |
650 | uuid = UUID::gen (); |
593 | |
651 | |
594 | speed_left = -0.1f; |
652 | speed_left = -0.1f; |
595 | /* copy the body_info to the body_used - this is only really |
653 | /* copy the body_info to the body_used - this is only really |
596 | * need for monsters, but doesn't hurt to do it for everything. |
654 | * need for monsters, but doesn't hurt to do it for everything. |
597 | * by doing so, when a monster is created, it has good starting |
655 | * by doing so, when a monster is created, it has good starting |
… | |
… | |
607 | object * |
665 | object * |
608 | object::clone () |
666 | object::clone () |
609 | { |
667 | { |
610 | object *neu = create (); |
668 | object *neu = create (); |
611 | copy_to (neu); |
669 | copy_to (neu); |
|
|
670 | neu->map = map; // not copied by copy_to |
612 | return neu; |
671 | return neu; |
613 | } |
672 | } |
614 | |
673 | |
615 | /* |
674 | /* |
616 | * If an object with the IS_TURNABLE() flag needs to be turned due |
675 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
667 | * UP_OBJ_FACE: only the objects face has changed. |
726 | * UP_OBJ_FACE: only the objects face has changed. |
668 | */ |
727 | */ |
669 | void |
728 | void |
670 | update_object (object *op, int action) |
729 | update_object (object *op, int action) |
671 | { |
730 | { |
672 | if (op == NULL) |
731 | if (!op) |
673 | { |
732 | { |
674 | /* this should never happen */ |
733 | /* this should never happen */ |
675 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
734 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
676 | return; |
735 | return; |
677 | } |
736 | } |
678 | |
737 | |
679 | if (op->env) |
738 | if (!op->is_on_map ()) |
680 | { |
739 | { |
681 | /* Animation is currently handled by client, so nothing |
740 | /* Animation is currently handled by client, so nothing |
682 | * to do in this case. |
741 | * to do in this case. |
683 | */ |
742 | */ |
684 | return; |
743 | return; |
685 | } |
744 | } |
686 | |
|
|
687 | /* If the map is saving, don't do anything as everything is |
|
|
688 | * going to get freed anyways. |
|
|
689 | */ |
|
|
690 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
691 | return; |
|
|
692 | |
745 | |
693 | /* make sure the object is within map boundaries */ |
746 | /* make sure the object is within map boundaries */ |
694 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
747 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
695 | { |
748 | { |
696 | LOG (llevError, "update_object() called for object out of map!\n"); |
749 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
756 | static int object_count; |
809 | static int object_count; |
757 | |
810 | |
758 | void object::link () |
811 | void object::link () |
759 | { |
812 | { |
760 | assert (!index);//D |
813 | assert (!index);//D |
761 | uuid = gen_uuid (); |
814 | uuid = UUID::gen (); |
762 | count = ++object_count; |
815 | count = ++object_count; |
763 | |
816 | |
764 | refcnt_inc (); |
817 | refcnt_inc (); |
765 | objects.insert (this); |
818 | objects.insert (this); |
766 | } |
819 | } |
… | |
… | |
839 | object::destroy_inv (bool drop_to_ground) |
892 | object::destroy_inv (bool drop_to_ground) |
840 | { |
893 | { |
841 | // need to check first, because the checks below might segfault |
894 | // need to check first, because the checks below might segfault |
842 | // as we might be on an invalid mapspace and crossfire code |
895 | // as we might be on an invalid mapspace and crossfire code |
843 | // is too buggy to ensure that the inventory is empty. |
896 | // is too buggy to ensure that the inventory is empty. |
844 | // corollary: if you create arrows etc. with stuff in tis inventory, |
897 | // corollary: if you create arrows etc. with stuff in its inventory, |
845 | // cf will crash below with off-map x and y |
898 | // cf will crash below with off-map x and y |
846 | if (!inv) |
899 | if (!inv) |
847 | return; |
900 | return; |
848 | |
901 | |
849 | /* Only if the space blocks everything do we not process - |
902 | /* Only if the space blocks everything do we not process - |
850 | * if some form of movement is allowed, let objects |
903 | * if some form of movement is allowed, let objects |
851 | * drop on that space. |
904 | * drop on that space. |
852 | */ |
905 | */ |
853 | if (!drop_to_ground |
906 | if (!drop_to_ground |
854 | || !map |
907 | || !map |
855 | || map->in_memory != MAP_IN_MEMORY |
908 | || map->in_memory != MAP_ACTIVE |
856 | || map->nodrop |
909 | || map->nodrop |
857 | || ms ().move_block == MOVE_ALL) |
910 | || ms ().move_block == MOVE_ALL) |
858 | { |
911 | { |
859 | while (inv) |
912 | while (inv) |
860 | { |
913 | { |
861 | inv->destroy_inv (drop_to_ground); |
914 | inv->destroy_inv (false); |
862 | inv->destroy (); |
915 | inv->destroy (); |
863 | } |
916 | } |
864 | } |
917 | } |
865 | else |
918 | else |
866 | { /* Put objects in inventory onto this space */ |
919 | { /* Put objects in inventory onto this space */ |
… | |
… | |
872 | || op->flag [FLAG_NO_DROP] |
925 | || op->flag [FLAG_NO_DROP] |
873 | || op->type == RUNE |
926 | || op->type == RUNE |
874 | || op->type == TRAP |
927 | || op->type == TRAP |
875 | || op->flag [FLAG_IS_A_TEMPLATE] |
928 | || op->flag [FLAG_IS_A_TEMPLATE] |
876 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
929 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
877 | op->destroy (); |
930 | op->destroy (true); |
878 | else |
931 | else |
879 | map->insert (op, x, y); |
932 | map->insert (op, x, y); |
880 | } |
933 | } |
881 | } |
934 | } |
882 | } |
935 | } |
… | |
… | |
886 | object *op = new object; |
939 | object *op = new object; |
887 | op->link (); |
940 | op->link (); |
888 | return op; |
941 | return op; |
889 | } |
942 | } |
890 | |
943 | |
|
|
944 | static struct freed_map : maptile |
|
|
945 | { |
|
|
946 | freed_map () |
|
|
947 | { |
|
|
948 | path = "<freed objects map>"; |
|
|
949 | name = "/internal/freed_objects_map"; |
|
|
950 | width = 3; |
|
|
951 | height = 3; |
|
|
952 | nodrop = 1; |
|
|
953 | |
|
|
954 | alloc (); |
|
|
955 | in_memory = MAP_ACTIVE; |
|
|
956 | } |
|
|
957 | |
|
|
958 | ~freed_map () |
|
|
959 | { |
|
|
960 | destroy (); |
|
|
961 | } |
|
|
962 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
963 | |
891 | void |
964 | void |
892 | object::do_destroy () |
965 | object::do_destroy () |
893 | { |
966 | { |
894 | attachable::do_destroy (); |
|
|
895 | |
|
|
896 | if (flag [FLAG_IS_LINKED]) |
967 | if (flag [FLAG_IS_LINKED]) |
897 | remove_button_link (this); |
968 | remove_button_link (this); |
898 | |
969 | |
899 | if (flag [FLAG_FRIENDLY]) |
970 | if (flag [FLAG_FRIENDLY]) |
900 | remove_friendly_object (this); |
971 | remove_friendly_object (this); |
901 | |
972 | |
902 | if (!flag [FLAG_REMOVED]) |
|
|
903 | remove (); |
973 | remove (); |
904 | |
974 | |
905 | destroy_inv (true); |
975 | attachable::do_destroy (); |
906 | |
976 | |
907 | deactivate (); |
977 | deactivate (); |
908 | unlink (); |
978 | unlink (); |
909 | |
979 | |
910 | flag [FLAG_FREED] = 1; |
980 | flag [FLAG_FREED] = 1; |
911 | |
981 | |
912 | // hack to ensure that freed objects still have a valid map |
982 | // hack to ensure that freed objects still have a valid map |
913 | { |
|
|
914 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
915 | |
|
|
916 | if (!freed_map) |
|
|
917 | { |
|
|
918 | freed_map = new maptile; |
|
|
919 | |
|
|
920 | freed_map->path = "<freed objects map>"; |
|
|
921 | freed_map->name = "/internal/freed_objects_map"; |
|
|
922 | freed_map->width = 3; |
|
|
923 | freed_map->height = 3; |
|
|
924 | |
|
|
925 | freed_map->alloc (); |
|
|
926 | freed_map->in_memory = MAP_IN_MEMORY; |
|
|
927 | } |
|
|
928 | |
|
|
929 | map = freed_map; |
983 | map = &freed_map; |
930 | x = 1; |
984 | x = 1; |
931 | y = 1; |
985 | y = 1; |
932 | } |
|
|
933 | |
986 | |
934 | if (more) |
987 | if (more) |
935 | { |
988 | { |
936 | more->destroy (); |
989 | more->destroy (); |
937 | more = 0; |
990 | more = 0; |
… | |
… | |
950 | object::destroy (bool destroy_inventory) |
1003 | object::destroy (bool destroy_inventory) |
951 | { |
1004 | { |
952 | if (destroyed ()) |
1005 | if (destroyed ()) |
953 | return; |
1006 | return; |
954 | |
1007 | |
|
|
1008 | if (!is_head () && !head->destroyed ()) |
|
|
1009 | { |
|
|
1010 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
1011 | head->destroy (destroy_inventory); |
|
|
1012 | return; |
|
|
1013 | } |
|
|
1014 | |
955 | if (destroy_inventory) |
1015 | destroy_inv (!destroy_inventory); |
956 | destroy_inv (false); |
|
|
957 | |
1016 | |
958 | if (is_head ()) |
1017 | if (is_head ()) |
959 | if (sound_destroy) |
1018 | if (sound_destroy) |
960 | play_sound (sound_destroy); |
1019 | play_sound (sound_destroy); |
961 | else if (flag [FLAG_MONSTER]) |
1020 | else if (flag [FLAG_MONSTER]) |
962 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
1021 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
963 | |
1022 | |
964 | attachable::destroy (); |
1023 | attachable::destroy (); |
965 | } |
|
|
966 | |
|
|
967 | /* |
|
|
968 | * sub_weight() recursively (outwards) subtracts a number from the |
|
|
969 | * weight of an object (and what is carried by it's environment(s)). |
|
|
970 | */ |
|
|
971 | void |
|
|
972 | sub_weight (object *op, signed long weight) |
|
|
973 | { |
|
|
974 | while (op != NULL) |
|
|
975 | { |
|
|
976 | if (op->type == CONTAINER) |
|
|
977 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
978 | |
|
|
979 | op->carrying -= weight; |
|
|
980 | op = op->env; |
|
|
981 | } |
|
|
982 | } |
1024 | } |
983 | |
1025 | |
984 | /* op->remove (): |
1026 | /* op->remove (): |
985 | * This function removes the object op from the linked list of objects |
1027 | * This function removes the object op from the linked list of objects |
986 | * which it is currently tied to. When this function is done, the |
1028 | * which it is currently tied to. When this function is done, the |
… | |
… | |
992 | object::do_remove () |
1034 | object::do_remove () |
993 | { |
1035 | { |
994 | object *tmp, *last = 0; |
1036 | object *tmp, *last = 0; |
995 | object *otmp; |
1037 | object *otmp; |
996 | |
1038 | |
997 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1039 | if (flag [FLAG_REMOVED]) |
998 | return; |
1040 | return; |
999 | |
1041 | |
1000 | SET_FLAG (this, FLAG_REMOVED); |
|
|
1001 | INVOKE_OBJECT (REMOVE, this); |
1042 | INVOKE_OBJECT (REMOVE, this); |
|
|
1043 | |
|
|
1044 | flag [FLAG_REMOVED] = true; |
1002 | |
1045 | |
1003 | if (more) |
1046 | if (more) |
1004 | more->remove (); |
1047 | more->remove (); |
1005 | |
1048 | |
1006 | /* |
1049 | /* |
1007 | * In this case, the object to be removed is in someones |
1050 | * In this case, the object to be removed is in someones |
1008 | * inventory. |
1051 | * inventory. |
1009 | */ |
1052 | */ |
1010 | if (env) |
1053 | if (env) |
1011 | { |
1054 | { |
|
|
1055 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1056 | if (object *pl = visible_to ()) |
|
|
1057 | esrv_del_item (pl->contr, count); |
|
|
1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1059 | |
|
|
1060 | adjust_weight (env, -total_weight ()); |
|
|
1061 | |
|
|
1062 | *(above ? &above->below : &env->inv) = below; |
|
|
1063 | |
1012 | if (nrof) |
1064 | if (below) |
1013 | sub_weight (env, weight * nrof); |
1065 | below->above = above; |
1014 | else |
1066 | |
1015 | sub_weight (env, weight + carrying); |
1067 | /* we set up values so that it could be inserted into |
|
|
1068 | * the map, but we don't actually do that - it is up |
|
|
1069 | * to the caller to decide what we want to do. |
|
|
1070 | */ |
|
|
1071 | map = env->map; |
|
|
1072 | x = env->x; |
|
|
1073 | y = env->y; |
|
|
1074 | above = 0; |
|
|
1075 | below = 0; |
|
|
1076 | env = 0; |
1016 | |
1077 | |
1017 | /* NO_FIX_PLAYER is set when a great many changes are being |
1078 | /* NO_FIX_PLAYER is set when a great many changes are being |
1018 | * made to players inventory. If set, avoiding the call |
1079 | * made to players inventory. If set, avoiding the call |
1019 | * to save cpu time. |
1080 | * to save cpu time. |
1020 | */ |
1081 | */ |
1021 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1082 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1022 | otmp->update_stats (); |
1083 | otmp->update_stats (); |
1023 | |
|
|
1024 | if (above) |
|
|
1025 | above->below = below; |
|
|
1026 | else |
|
|
1027 | env->inv = below; |
|
|
1028 | |
|
|
1029 | if (below) |
|
|
1030 | below->above = above; |
|
|
1031 | |
|
|
1032 | /* we set up values so that it could be inserted into |
|
|
1033 | * the map, but we don't actually do that - it is up |
|
|
1034 | * to the caller to decide what we want to do. |
|
|
1035 | */ |
|
|
1036 | x = env->x, y = env->y; |
|
|
1037 | map = env->map; |
|
|
1038 | above = 0, below = 0; |
|
|
1039 | env = 0; |
|
|
1040 | } |
1084 | } |
1041 | else if (map) |
1085 | else if (map) |
1042 | { |
1086 | { |
1043 | if (type == PLAYER) |
|
|
1044 | { |
|
|
1045 | // leaving a spot always closes any open container on the ground |
|
|
1046 | if (container && !container->env) |
|
|
1047 | // this causes spurious floorbox updates, but it ensures |
|
|
1048 | // that the CLOSE event is being sent. |
|
|
1049 | close_container (); |
|
|
1050 | |
|
|
1051 | --map->players; |
|
|
1052 | map->touch (); |
|
|
1053 | } |
|
|
1054 | |
|
|
1055 | map->dirty = true; |
1087 | map->dirty = true; |
1056 | mapspace &ms = this->ms (); |
1088 | mapspace &ms = this->ms (); |
|
|
1089 | |
|
|
1090 | if (object *pl = ms.player ()) |
|
|
1091 | { |
|
|
1092 | if (type == PLAYER) // this == pl(!) |
|
|
1093 | { |
|
|
1094 | // leaving a spot always closes any open container on the ground |
|
|
1095 | if (container && !container->env) |
|
|
1096 | // this causes spurious floorbox updates, but it ensures |
|
|
1097 | // that the CLOSE event is being sent. |
|
|
1098 | close_container (); |
|
|
1099 | |
|
|
1100 | --map->players; |
|
|
1101 | map->touch (); |
|
|
1102 | } |
|
|
1103 | else if (pl->container == this) |
|
|
1104 | { |
|
|
1105 | // removing a container should close it |
|
|
1106 | close_container (); |
|
|
1107 | } |
|
|
1108 | |
|
|
1109 | esrv_del_item (pl->contr, count); |
|
|
1110 | } |
1057 | |
1111 | |
1058 | /* link the object above us */ |
1112 | /* link the object above us */ |
1059 | if (above) |
1113 | if (above) |
1060 | above->below = below; |
1114 | above->below = below; |
1061 | else |
1115 | else |
… | |
… | |
1091 | * removed (most likely destroyed), update the player view |
1145 | * removed (most likely destroyed), update the player view |
1092 | * appropriately. |
1146 | * appropriately. |
1093 | */ |
1147 | */ |
1094 | pl->close_container (); |
1148 | pl->close_container (); |
1095 | |
1149 | |
|
|
1150 | //TODO: the floorbox prev/next might need updating |
|
|
1151 | //esrv_del_item (pl->contr, count); |
|
|
1152 | //TODO: update floorbox to preserve ordering |
|
|
1153 | if (pl->contr->ns) |
1096 | pl->contr->ns->floorbox_update (); |
1154 | pl->contr->ns->floorbox_update (); |
1097 | } |
1155 | } |
1098 | |
1156 | |
1099 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1157 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1100 | { |
1158 | { |
1101 | /* No point updating the players look faces if he is the object |
1159 | /* No point updating the players look faces if he is the object |
… | |
… | |
1140 | merge_ob (object *op, object *top) |
1198 | merge_ob (object *op, object *top) |
1141 | { |
1199 | { |
1142 | if (!op->nrof) |
1200 | if (!op->nrof) |
1143 | return 0; |
1201 | return 0; |
1144 | |
1202 | |
1145 | if (top) |
1203 | if (!top) |
1146 | for (top = op; top && top->above; top = top->above) |
1204 | for (top = op; top && top->above; top = top->above) |
1147 | ; |
1205 | ; |
1148 | |
1206 | |
1149 | for (; top; top = top->below) |
1207 | for (; top; top = top->below) |
1150 | { |
|
|
1151 | if (top == op) |
|
|
1152 | continue; |
|
|
1153 | |
|
|
1154 | if (object::can_merge (op, top)) |
1208 | if (object::can_merge (op, top)) |
1155 | { |
1209 | { |
1156 | top->nrof += op->nrof; |
1210 | top->nrof += op->nrof; |
1157 | |
1211 | |
1158 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1212 | if (object *pl = top->visible_to ()) |
1159 | op->weight = 0; /* Don't want any adjustements now */ |
1213 | esrv_update_item (UPD_NROF, pl, top); |
|
|
1214 | |
|
|
1215 | op->weight = 0; // cancel the addition above |
|
|
1216 | op->carrying = 0; // must be 0 already |
|
|
1217 | |
1160 | op->destroy (); |
1218 | op->destroy (1); |
|
|
1219 | |
1161 | return top; |
1220 | return top; |
1162 | } |
1221 | } |
1163 | } |
|
|
1164 | |
1222 | |
1165 | return 0; |
1223 | return 0; |
1166 | } |
1224 | } |
1167 | |
1225 | |
1168 | void |
1226 | void |
… | |
… | |
1227 | object * |
1285 | object * |
1228 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1286 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1229 | { |
1287 | { |
1230 | assert (!op->flag [FLAG_FREED]); |
1288 | assert (!op->flag [FLAG_FREED]); |
1231 | |
1289 | |
1232 | object *top, *floor = NULL; |
|
|
1233 | |
|
|
1234 | op->remove (); |
1290 | op->remove (); |
1235 | |
1291 | |
1236 | /* Ideally, the caller figures this out. However, it complicates a lot |
1292 | /* Ideally, the caller figures this out. However, it complicates a lot |
1237 | * of areas of callers (eg, anything that uses find_free_spot would now |
1293 | * of areas of callers (eg, anything that uses find_free_spot would now |
1238 | * need extra work |
1294 | * need extra work |
1239 | */ |
1295 | */ |
1240 | if (!xy_normalise (m, op->x, op->y)) |
1296 | if (!xy_normalise (m, op->x, op->y)) |
1241 | { |
1297 | { |
1242 | op->destroy (); |
1298 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1243 | return 0; |
1299 | return 0; |
1244 | } |
1300 | } |
1245 | |
1301 | |
1246 | if (object *more = op->more) |
1302 | if (object *more = op->more) |
1247 | if (!insert_ob_in_map (more, m, originator, flag)) |
1303 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1256 | */ |
1312 | */ |
1257 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1313 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1258 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1314 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1259 | if (object::can_merge (op, tmp)) |
1315 | if (object::can_merge (op, tmp)) |
1260 | { |
1316 | { |
|
|
1317 | // TODO: we atcually want to update tmp, not op, |
|
|
1318 | // but some caller surely breaks when we return tmp |
|
|
1319 | // from here :/ |
1261 | op->nrof += tmp->nrof; |
1320 | op->nrof += tmp->nrof; |
1262 | tmp->destroy (); |
1321 | tmp->destroy (1); |
1263 | } |
1322 | } |
1264 | |
1323 | |
1265 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1324 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1266 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1325 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1267 | |
1326 | |
… | |
… | |
1287 | /* since *below* originator, no need to update top */ |
1346 | /* since *below* originator, no need to update top */ |
1288 | originator->below = op; |
1347 | originator->below = op; |
1289 | } |
1348 | } |
1290 | else |
1349 | else |
1291 | { |
1350 | { |
|
|
1351 | object *top, *floor = NULL; |
|
|
1352 | |
1292 | top = ms.bot; |
1353 | top = ms.bot; |
1293 | |
1354 | |
1294 | /* If there are other objects, then */ |
1355 | /* If there are other objects, then */ |
1295 | if (top) |
1356 | if (top) |
1296 | { |
1357 | { |
… | |
… | |
1395 | } |
1456 | } |
1396 | |
1457 | |
1397 | op->map->dirty = true; |
1458 | op->map->dirty = true; |
1398 | |
1459 | |
1399 | if (object *pl = ms.player ()) |
1460 | if (object *pl = ms.player ()) |
|
|
1461 | //TODO: the floorbox prev/next might need updating |
|
|
1462 | //esrv_send_item (pl, op); |
|
|
1463 | //TODO: update floorbox to preserve ordering |
|
|
1464 | if (pl->contr->ns) |
1400 | pl->contr->ns->floorbox_update (); |
1465 | pl->contr->ns->floorbox_update (); |
1401 | |
1466 | |
1402 | /* If this object glows, it may affect lighting conditions that are |
1467 | /* If this object glows, it may affect lighting conditions that are |
1403 | * visible to others on this map. But update_all_los is really |
1468 | * visible to others on this map. But update_all_los is really |
1404 | * an inefficient way to do this, as it means los for all players |
1469 | * an inefficient way to do this, as it means los for all players |
1405 | * on the map will get recalculated. The players could very well |
1470 | * on the map will get recalculated. The players could very well |
… | |
… | |
1447 | * op is the object to insert it under: supplies x and the map. |
1512 | * op is the object to insert it under: supplies x and the map. |
1448 | */ |
1513 | */ |
1449 | void |
1514 | void |
1450 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1515 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1451 | { |
1516 | { |
1452 | object *tmp, *tmp1; |
|
|
1453 | |
|
|
1454 | /* first search for itself and remove any old instances */ |
1517 | /* first search for itself and remove any old instances */ |
1455 | |
1518 | |
1456 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1519 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1457 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1520 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1458 | tmp->destroy (); |
1521 | tmp->destroy (1); |
1459 | |
1522 | |
1460 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1523 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1461 | |
1524 | |
1462 | tmp1->x = op->x; |
1525 | tmp->x = op->x; |
1463 | tmp1->y = op->y; |
1526 | tmp->y = op->y; |
|
|
1527 | |
1464 | insert_ob_in_map (tmp1, op->map, op, 0); |
1528 | insert_ob_in_map (tmp, op->map, op, 0); |
1465 | } |
1529 | } |
1466 | |
1530 | |
1467 | object * |
1531 | object * |
1468 | object::insert_at (object *where, object *originator, int flags) |
1532 | object::insert_at (object *where, object *originator, int flags) |
1469 | { |
1533 | { |
|
|
1534 | if (where->env) |
|
|
1535 | return where->env->insert (this); |
|
|
1536 | else |
1470 | return where->map->insert (this, where->x, where->y, originator, flags); |
1537 | return where->map->insert (this, where->x, where->y, originator, flags); |
1471 | } |
1538 | } |
1472 | |
1539 | |
1473 | /* |
1540 | /* |
1474 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
|
|
1475 | * is returned contains nr objects, and the remaining parts contains |
|
|
1476 | * the rest (or is removed and freed if that number is 0). |
|
|
1477 | * On failure, NULL is returned, and the reason put into the |
|
|
1478 | * global static errmsg array. |
|
|
1479 | */ |
|
|
1480 | object * |
|
|
1481 | get_split_ob (object *orig_ob, uint32 nr) |
|
|
1482 | { |
|
|
1483 | object *newob; |
|
|
1484 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
|
|
1485 | |
|
|
1486 | if (orig_ob->nrof < nr) |
|
|
1487 | { |
|
|
1488 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1489 | return NULL; |
|
|
1490 | } |
|
|
1491 | |
|
|
1492 | newob = object_create_clone (orig_ob); |
|
|
1493 | |
|
|
1494 | if ((orig_ob->nrof -= nr) < 1) |
|
|
1495 | orig_ob->destroy (1); |
|
|
1496 | else if (!is_removed) |
|
|
1497 | { |
|
|
1498 | if (orig_ob->env != NULL) |
|
|
1499 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
|
|
1500 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
|
|
1501 | { |
|
|
1502 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
|
|
1503 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
|
|
1504 | return NULL; |
|
|
1505 | } |
|
|
1506 | } |
|
|
1507 | |
|
|
1508 | newob->nrof = nr; |
|
|
1509 | |
|
|
1510 | return newob; |
|
|
1511 | } |
|
|
1512 | |
|
|
1513 | /* |
|
|
1514 | * decrease_ob_nr(object, number) decreases a specified number from |
1541 | * decrease(object, number) decreases a specified number from |
1515 | * the amount of an object. If the amount reaches 0, the object |
1542 | * the amount of an object. If the amount reaches 0, the object |
1516 | * is subsequently removed and freed. |
1543 | * is subsequently removed and freed. |
1517 | * |
1544 | * |
1518 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1545 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1519 | */ |
1546 | */ |
|
|
1547 | bool |
|
|
1548 | object::decrease (sint32 nr) |
|
|
1549 | { |
|
|
1550 | if (!nr) |
|
|
1551 | return true; |
|
|
1552 | |
|
|
1553 | nr = min (nr, nrof); |
|
|
1554 | |
|
|
1555 | nrof -= nr; |
|
|
1556 | |
|
|
1557 | if (nrof) |
|
|
1558 | { |
|
|
1559 | adjust_weight (env, -weight * nr); // carrying == 0 |
|
|
1560 | |
|
|
1561 | if (object *pl = visible_to ()) |
|
|
1562 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1563 | |
|
|
1564 | return true; |
|
|
1565 | } |
|
|
1566 | else |
|
|
1567 | { |
|
|
1568 | destroy (1); |
|
|
1569 | return false; |
|
|
1570 | } |
|
|
1571 | } |
|
|
1572 | |
|
|
1573 | /* |
|
|
1574 | * split(ob,nr) splits up ob into two parts. The part which |
|
|
1575 | * is returned contains nr objects, and the remaining parts contains |
|
|
1576 | * the rest (or is removed and returned if that number is 0). |
|
|
1577 | * On failure, NULL is returned. |
|
|
1578 | */ |
1520 | object * |
1579 | object * |
1521 | decrease_ob_nr (object *op, uint32 i) |
1580 | object::split (sint32 nr) |
1522 | { |
1581 | { |
1523 | object *tmp; |
1582 | int have = number_of (); |
1524 | |
1583 | |
1525 | if (i == 0) /* objects with op->nrof require this check */ |
1584 | if (have < nr) |
1526 | return op; |
1585 | return 0; |
1527 | |
1586 | else if (have == nr) |
1528 | if (i > op->nrof) |
|
|
1529 | i = op->nrof; |
|
|
1530 | |
|
|
1531 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1532 | op->nrof -= i; |
|
|
1533 | else if (op->env) |
|
|
1534 | { |
1587 | { |
1535 | /* is this object in the players inventory, or sub container |
|
|
1536 | * therein? |
|
|
1537 | */ |
|
|
1538 | tmp = op->in_player (); |
|
|
1539 | /* nope. Is this a container the player has opened? |
|
|
1540 | * If so, set tmp to that player. |
|
|
1541 | * IMO, searching through all the players will mostly |
|
|
1542 | * likely be quicker than following op->env to the map, |
|
|
1543 | * and then searching the map for a player. |
|
|
1544 | */ |
|
|
1545 | if (!tmp) |
|
|
1546 | for_all_players (pl) |
|
|
1547 | if (pl->ob->container == op->env) |
|
|
1548 | { |
|
|
1549 | tmp = pl->ob; |
|
|
1550 | break; |
|
|
1551 | } |
|
|
1552 | |
|
|
1553 | if (i < op->nrof) |
|
|
1554 | { |
|
|
1555 | sub_weight (op->env, op->weight * i); |
|
|
1556 | op->nrof -= i; |
|
|
1557 | if (tmp) |
|
|
1558 | esrv_send_item (tmp, op); |
|
|
1559 | } |
|
|
1560 | else |
|
|
1561 | { |
|
|
1562 | op->remove (); |
1588 | remove (); |
1563 | op->nrof = 0; |
1589 | return this; |
1564 | if (tmp) |
|
|
1565 | esrv_del_item (tmp->contr, op->count); |
|
|
1566 | } |
|
|
1567 | } |
1590 | } |
1568 | else |
1591 | else |
1569 | { |
1592 | { |
1570 | object *above = op->above; |
1593 | decrease (nr); |
1571 | |
1594 | |
1572 | if (i < op->nrof) |
1595 | object *op = deep_clone (); |
1573 | op->nrof -= i; |
1596 | op->nrof = nr; |
1574 | else |
|
|
1575 | { |
|
|
1576 | op->remove (); |
|
|
1577 | op->nrof = 0; |
|
|
1578 | } |
|
|
1579 | |
|
|
1580 | /* Since we just removed op, op->above is null */ |
|
|
1581 | for (tmp = above; tmp; tmp = tmp->above) |
|
|
1582 | if (tmp->type == PLAYER) |
|
|
1583 | { |
|
|
1584 | if (op->nrof) |
|
|
1585 | esrv_send_item (tmp, op); |
|
|
1586 | else |
|
|
1587 | esrv_del_item (tmp->contr, op->count); |
|
|
1588 | } |
|
|
1589 | } |
|
|
1590 | |
|
|
1591 | if (op->nrof) |
|
|
1592 | return op; |
1597 | return op; |
1593 | else |
|
|
1594 | { |
|
|
1595 | op->destroy (); |
|
|
1596 | return 0; |
|
|
1597 | } |
|
|
1598 | } |
|
|
1599 | |
|
|
1600 | /* |
|
|
1601 | * add_weight(object, weight) adds the specified weight to an object, |
|
|
1602 | * and also updates how much the environment(s) is/are carrying. |
|
|
1603 | */ |
|
|
1604 | void |
|
|
1605 | add_weight (object *op, signed long weight) |
|
|
1606 | { |
|
|
1607 | while (op != NULL) |
|
|
1608 | { |
|
|
1609 | if (op->type == CONTAINER) |
|
|
1610 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
|
|
1611 | |
|
|
1612 | op->carrying += weight; |
|
|
1613 | op = op->env; |
|
|
1614 | } |
1598 | } |
1615 | } |
1599 | } |
1616 | |
1600 | |
1617 | object * |
1601 | object * |
1618 | insert_ob_in_ob (object *op, object *where) |
1602 | insert_ob_in_ob (object *op, object *where) |
… | |
… | |
1643 | * be != op, if items are merged. -Tero |
1627 | * be != op, if items are merged. -Tero |
1644 | */ |
1628 | */ |
1645 | object * |
1629 | object * |
1646 | object::insert (object *op) |
1630 | object::insert (object *op) |
1647 | { |
1631 | { |
1648 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1649 | op->remove (); |
|
|
1650 | |
|
|
1651 | if (op->more) |
1632 | if (op->more) |
1652 | { |
1633 | { |
1653 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1634 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1654 | return op; |
1635 | return op; |
1655 | } |
1636 | } |
1656 | |
1637 | |
1657 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1638 | op->remove (); |
1658 | CLEAR_FLAG (op, FLAG_REMOVED); |
1639 | |
|
|
1640 | op->flag [FLAG_OBJ_ORIGINAL] = 0; |
1659 | |
1641 | |
1660 | if (op->nrof) |
1642 | if (op->nrof) |
1661 | { |
|
|
1662 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1643 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1663 | if (object::can_merge (tmp, op)) |
1644 | if (object::can_merge (tmp, op)) |
1664 | { |
1645 | { |
1665 | /* return the original object and remove inserted object |
1646 | /* return the original object and remove inserted object |
1666 | (client needs the original object) */ |
1647 | (client needs the original object) */ |
1667 | tmp->nrof += op->nrof; |
1648 | tmp->nrof += op->nrof; |
1668 | /* Weight handling gets pretty funky. Since we are adding to |
1649 | |
1669 | * tmp->nrof, we need to increase the weight. |
1650 | if (object *pl = tmp->visible_to ()) |
1670 | */ |
1651 | esrv_update_item (UPD_NROF, pl, tmp); |
|
|
1652 | |
1671 | add_weight (this, op->weight * op->nrof); |
1653 | adjust_weight (this, op->total_weight ()); |
1672 | SET_FLAG (op, FLAG_REMOVED); |
1654 | |
1673 | op->destroy (); /* free the inserted object */ |
1655 | op->destroy (1); |
1674 | op = tmp; |
1656 | op = tmp; |
1675 | op->remove (); /* and fix old object's links */ |
1657 | goto inserted; |
1676 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1677 | break; |
|
|
1678 | } |
1658 | } |
1679 | |
1659 | |
1680 | /* I assume combined objects have no inventory |
|
|
1681 | * We add the weight - this object could have just been removed |
|
|
1682 | * (if it was possible to merge). calling remove_ob will subtract |
|
|
1683 | * the weight, so we need to add it in again, since we actually do |
|
|
1684 | * the linking below |
|
|
1685 | */ |
|
|
1686 | add_weight (this, op->weight * op->nrof); |
|
|
1687 | } |
|
|
1688 | else |
|
|
1689 | add_weight (this, (op->weight + op->carrying)); |
|
|
1690 | |
|
|
1691 | if (object *otmp = this->in_player ()) |
|
|
1692 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
|
|
1693 | otmp->update_stats (); |
|
|
1694 | |
|
|
1695 | op->owner = 0; // its his/hers now. period. |
1660 | op->owner = 0; // it's his/hers now. period. |
1696 | op->map = 0; |
1661 | op->map = 0; |
|
|
1662 | op->x = 0; |
|
|
1663 | op->y = 0; |
|
|
1664 | |
|
|
1665 | op->above = 0; |
|
|
1666 | op->below = inv; |
1697 | op->env = this; |
1667 | op->env = this; |
1698 | op->above = 0; |
|
|
1699 | op->below = 0; |
|
|
1700 | op->x = op->y = 0; |
|
|
1701 | |
1668 | |
|
|
1669 | if (inv) |
|
|
1670 | inv->above = op; |
|
|
1671 | |
|
|
1672 | inv = op; |
|
|
1673 | |
|
|
1674 | op->flag [FLAG_REMOVED] = 0; |
|
|
1675 | |
|
|
1676 | if (object *pl = op->visible_to ()) |
|
|
1677 | esrv_send_item (pl, op); |
|
|
1678 | |
|
|
1679 | adjust_weight (this, op->total_weight ()); |
|
|
1680 | |
|
|
1681 | inserted: |
1702 | /* reset the light list and los of the players on the map */ |
1682 | /* reset the light list and los of the players on the map */ |
1703 | if (op->glow_radius && map) |
1683 | if (op->glow_radius && map && map->darkness) |
1704 | { |
|
|
1705 | #ifdef DEBUG_LIGHTS |
|
|
1706 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
|
|
1707 | #endif /* DEBUG_LIGHTS */ |
|
|
1708 | if (map->darkness) |
|
|
1709 | update_all_los (map, x, y); |
1684 | update_all_los (map, x, y); |
1710 | } |
|
|
1711 | |
1685 | |
1712 | /* Client has no idea of ordering so lets not bother ordering it here. |
1686 | // if this is a player's inventory, update stats |
1713 | * It sure simplifies this function... |
1687 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1714 | */ |
1688 | update_stats (); |
1715 | if (!inv) |
|
|
1716 | inv = op; |
|
|
1717 | else |
|
|
1718 | { |
|
|
1719 | op->below = inv; |
|
|
1720 | op->below->above = op; |
|
|
1721 | inv = op; |
|
|
1722 | } |
|
|
1723 | |
1689 | |
1724 | INVOKE_OBJECT (INSERT, this); |
1690 | INVOKE_OBJECT (INSERT, this); |
1725 | |
1691 | |
1726 | return op; |
1692 | return op; |
1727 | } |
1693 | } |
… | |
… | |
1855 | LOG (llevError, "Present_arch called outside map.\n"); |
1821 | LOG (llevError, "Present_arch called outside map.\n"); |
1856 | return NULL; |
1822 | return NULL; |
1857 | } |
1823 | } |
1858 | |
1824 | |
1859 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1825 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1860 | if (tmp->arch == at) |
1826 | if (tmp->arch->archname == at->archname) |
1861 | return tmp; |
1827 | return tmp; |
1862 | |
1828 | |
1863 | return NULL; |
1829 | return NULL; |
1864 | } |
1830 | } |
1865 | |
1831 | |
… | |
… | |
1929 | * The first matching object is returned, or NULL if none. |
1895 | * The first matching object is returned, or NULL if none. |
1930 | */ |
1896 | */ |
1931 | object * |
1897 | object * |
1932 | present_arch_in_ob (const archetype *at, const object *op) |
1898 | present_arch_in_ob (const archetype *at, const object *op) |
1933 | { |
1899 | { |
1934 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1900 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1935 | if (tmp->arch == at) |
1901 | if (tmp->arch->archname == at->archname) |
1936 | return tmp; |
1902 | return tmp; |
1937 | |
1903 | |
1938 | return NULL; |
1904 | return NULL; |
1939 | } |
1905 | } |
1940 | |
1906 | |
… | |
… | |
1942 | * activate recursively a flag on an object inventory |
1908 | * activate recursively a flag on an object inventory |
1943 | */ |
1909 | */ |
1944 | void |
1910 | void |
1945 | flag_inv (object *op, int flag) |
1911 | flag_inv (object *op, int flag) |
1946 | { |
1912 | { |
1947 | if (op->inv) |
|
|
1948 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1913 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1949 | { |
1914 | { |
1950 | SET_FLAG (tmp, flag); |
1915 | SET_FLAG (tmp, flag); |
1951 | flag_inv (tmp, flag); |
1916 | flag_inv (tmp, flag); |
1952 | } |
1917 | } |
1953 | } |
1918 | } |
1954 | |
1919 | |
1955 | /* |
1920 | /* |
1956 | * deactivate recursively a flag on an object inventory |
1921 | * deactivate recursively a flag on an object inventory |
1957 | */ |
1922 | */ |
1958 | void |
1923 | void |
1959 | unflag_inv (object *op, int flag) |
1924 | unflag_inv (object *op, int flag) |
1960 | { |
1925 | { |
1961 | if (op->inv) |
|
|
1962 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1926 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1963 | { |
1927 | { |
1964 | CLEAR_FLAG (tmp, flag); |
1928 | CLEAR_FLAG (tmp, flag); |
1965 | unflag_inv (tmp, flag); |
1929 | unflag_inv (tmp, flag); |
1966 | } |
1930 | } |
1967 | } |
1931 | } |
1968 | |
1932 | |
1969 | /* |
1933 | /* |
1970 | * find_free_spot(object, map, x, y, start, stop) will search for |
1934 | * find_free_spot(object, map, x, y, start, stop) will search for |
1971 | * a spot at the given map and coordinates which will be able to contain |
1935 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
1973 | * to search (see the freearr_x/y[] definition). |
1937 | * to search (see the freearr_x/y[] definition). |
1974 | * It returns a random choice among the alternatives found. |
1938 | * It returns a random choice among the alternatives found. |
1975 | * start and stop are where to start relative to the free_arr array (1,9 |
1939 | * start and stop are where to start relative to the free_arr array (1,9 |
1976 | * does all 4 immediate directions). This returns the index into the |
1940 | * does all 4 immediate directions). This returns the index into the |
1977 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1941 | * array of the free spot, -1 if no spot available (dir 0 = x,y) |
1978 | * Note - this only checks to see if there is space for the head of the |
|
|
1979 | * object - if it is a multispace object, this should be called for all |
|
|
1980 | * pieces. |
|
|
1981 | * Note2: This function does correctly handle tiled maps, but does not |
1942 | * Note: This function does correctly handle tiled maps, but does not |
1982 | * inform the caller. However, insert_ob_in_map will update as |
1943 | * inform the caller. However, insert_ob_in_map will update as |
1983 | * necessary, so the caller shouldn't need to do any special work. |
1944 | * necessary, so the caller shouldn't need to do any special work. |
1984 | * Note - updated to take an object instead of archetype - this is necessary |
1945 | * Note - updated to take an object instead of archetype - this is necessary |
1985 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1946 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1986 | * to know if the space in question will block the object. We can't use |
1947 | * to know if the space in question will block the object. We can't use |
… | |
… | |
2007 | |
1968 | |
2008 | /* However, often |
1969 | /* However, often |
2009 | * ob doesn't have any move type (when used to place exits) |
1970 | * ob doesn't have any move type (when used to place exits) |
2010 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
1971 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
2011 | */ |
1972 | */ |
2012 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
1973 | if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL) |
2013 | { |
1974 | { |
2014 | altern [index++] = i; |
1975 | altern [index++] = i; |
2015 | continue; |
1976 | continue; |
2016 | } |
1977 | } |
2017 | |
1978 | |
… | |
… | |
2031 | |
1992 | |
2032 | /* Note it is intentional that we check ob - the movement type of the |
1993 | /* Note it is intentional that we check ob - the movement type of the |
2033 | * head of the object should correspond for the entire object. |
1994 | * head of the object should correspond for the entire object. |
2034 | */ |
1995 | */ |
2035 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1996 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
1997 | continue; |
|
|
1998 | |
|
|
1999 | if (ob->blocked (m, pos.x, pos.y)) |
2036 | continue; |
2000 | continue; |
2037 | |
2001 | |
2038 | altern [index++] = i; |
2002 | altern [index++] = i; |
2039 | } |
2003 | } |
2040 | |
2004 | |
… | |
… | |
2351 | |
2315 | |
2352 | /* |
2316 | /* |
2353 | * create clone from object to another |
2317 | * create clone from object to another |
2354 | */ |
2318 | */ |
2355 | object * |
2319 | object * |
2356 | object_create_clone (object *asrc) |
2320 | object::deep_clone () |
2357 | { |
2321 | { |
2358 | object *dst = 0, *tmp, *src, *prev, *item; |
2322 | assert (("deep_clone called on non-head object", is_head ())); |
2359 | |
2323 | |
2360 | if (!asrc) |
2324 | object *dst = clone (); |
2361 | return 0; |
|
|
2362 | |
2325 | |
2363 | src = asrc->head_ (); |
2326 | object *prev = dst; |
2364 | |
|
|
2365 | prev = 0; |
|
|
2366 | for (object *part = src; part; part = part->more) |
2327 | for (object *part = this->more; part; part = part->more) |
2367 | { |
2328 | { |
2368 | tmp = part->clone (); |
2329 | object *tmp = part->clone (); |
2369 | tmp->x -= src->x; |
|
|
2370 | tmp->y -= src->y; |
|
|
2371 | |
|
|
2372 | if (!part->head) |
|
|
2373 | { |
|
|
2374 | dst = tmp; |
|
|
2375 | tmp->head = 0; |
|
|
2376 | } |
|
|
2377 | else |
|
|
2378 | tmp->head = dst; |
2330 | tmp->head = dst; |
2379 | |
|
|
2380 | tmp->more = 0; |
|
|
2381 | |
|
|
2382 | if (prev) |
|
|
2383 | prev->more = tmp; |
2331 | prev->more = tmp; |
2384 | |
|
|
2385 | prev = tmp; |
2332 | prev = tmp; |
2386 | } |
2333 | } |
2387 | |
2334 | |
2388 | for (item = src->inv; item; item = item->below) |
2335 | for (object *item = inv; item; item = item->below) |
2389 | insert_ob_in_ob (object_create_clone (item), dst); |
2336 | insert_ob_in_ob (item->deep_clone (), dst); |
2390 | |
2337 | |
2391 | return dst; |
2338 | return dst; |
2392 | } |
2339 | } |
2393 | |
2340 | |
2394 | /* This returns the first object in who's inventory that |
2341 | /* This returns the first object in who's inventory that |
… | |
… | |
2403 | return tmp; |
2350 | return tmp; |
2404 | |
2351 | |
2405 | return 0; |
2352 | return 0; |
2406 | } |
2353 | } |
2407 | |
2354 | |
2408 | /* If ob has a field named key, return the link from the list, |
2355 | const shstr & |
2409 | * otherwise return NULL. |
2356 | object::kv_get (const shstr &key) const |
2410 | * |
|
|
2411 | * key must be a passed in shared string - otherwise, this won't |
|
|
2412 | * do the desired thing. |
|
|
2413 | */ |
|
|
2414 | key_value * |
|
|
2415 | get_ob_key_link (const object *ob, const char *key) |
|
|
2416 | { |
2357 | { |
2417 | for (key_value *link = ob->key_values; link; link = link->next) |
2358 | for (key_value *kv = key_values; kv; kv = kv->next) |
2418 | if (link->key == key) |
2359 | if (kv->key == key) |
2419 | return link; |
|
|
2420 | |
|
|
2421 | return 0; |
|
|
2422 | } |
|
|
2423 | |
|
|
2424 | /* |
|
|
2425 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2426 | * |
|
|
2427 | * The argument doesn't need to be a shared string. |
|
|
2428 | * |
|
|
2429 | * The returned string is shared. |
|
|
2430 | */ |
|
|
2431 | const char * |
|
|
2432 | get_ob_key_value (const object *op, const char *const key) |
|
|
2433 | { |
|
|
2434 | key_value *link; |
|
|
2435 | shstr_cmp canonical_key (key); |
|
|
2436 | |
|
|
2437 | if (!canonical_key) |
|
|
2438 | { |
|
|
2439 | /* 1. There being a field named key on any object |
|
|
2440 | * implies there'd be a shared string to find. |
|
|
2441 | * 2. Since there isn't, no object has this field. |
|
|
2442 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2443 | */ |
|
|
2444 | return 0; |
|
|
2445 | } |
|
|
2446 | |
|
|
2447 | /* This is copied from get_ob_key_link() above - |
|
|
2448 | * only 4 lines, and saves the function call overhead. |
|
|
2449 | */ |
|
|
2450 | for (link = op->key_values; link; link = link->next) |
|
|
2451 | if (link->key == canonical_key) |
|
|
2452 | return link->value; |
2360 | return kv->value; |
2453 | |
2361 | |
2454 | return 0; |
2362 | return shstr_null; |
2455 | } |
2363 | } |
2456 | |
2364 | |
2457 | /* |
2365 | void |
2458 | * Updates the canonical_key in op to value. |
2366 | object::kv_set (const shstr &key, const shstr &value) |
2459 | * |
|
|
2460 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2461 | * |
|
|
2462 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2463 | * keys. |
|
|
2464 | * |
|
|
2465 | * Returns TRUE on success. |
|
|
2466 | */ |
|
|
2467 | int |
|
|
2468 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2469 | { |
2367 | { |
2470 | key_value *field = NULL, *last = NULL; |
2368 | for (key_value *kv = key_values; kv; kv = kv->next) |
2471 | |
2369 | if (kv->key == key) |
2472 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2473 | { |
|
|
2474 | if (field->key != canonical_key) |
|
|
2475 | { |
2370 | { |
2476 | last = field; |
2371 | kv->value = value; |
2477 | continue; |
2372 | return; |
2478 | } |
2373 | } |
2479 | |
2374 | |
2480 | if (value) |
2375 | key_value *kv = new key_value; |
2481 | field->value = value; |
2376 | |
2482 | else |
2377 | kv->next = key_values; |
|
|
2378 | kv->key = key; |
|
|
2379 | kv->value = value; |
|
|
2380 | |
|
|
2381 | key_values = kv; |
|
|
2382 | } |
|
|
2383 | |
|
|
2384 | void |
|
|
2385 | object::kv_del (const shstr &key) |
|
|
2386 | { |
|
|
2387 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2388 | if ((*kvp)->key == key) |
2483 | { |
2389 | { |
2484 | /* Basically, if the archetype has this key set, |
2390 | key_value *kv = *kvp; |
2485 | * we need to store the null value so when we save |
2391 | *kvp = (*kvp)->next; |
2486 | * it, we save the empty value so that when we load, |
2392 | delete kv; |
2487 | * we get this value back again. |
2393 | return; |
2488 | */ |
|
|
2489 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2490 | field->value = 0; |
|
|
2491 | else |
|
|
2492 | { |
|
|
2493 | if (last) |
|
|
2494 | last->next = field->next; |
|
|
2495 | else |
|
|
2496 | op->key_values = field->next; |
|
|
2497 | |
|
|
2498 | delete field; |
|
|
2499 | } |
|
|
2500 | } |
2394 | } |
2501 | return TRUE; |
|
|
2502 | } |
|
|
2503 | /* IF we get here, key doesn't exist */ |
|
|
2504 | |
|
|
2505 | /* No field, we'll have to add it. */ |
|
|
2506 | |
|
|
2507 | if (!add_key) |
|
|
2508 | return FALSE; |
|
|
2509 | |
|
|
2510 | /* There isn't any good reason to store a null |
|
|
2511 | * value in the key/value list. If the archetype has |
|
|
2512 | * this key, then we should also have it, so shouldn't |
|
|
2513 | * be here. If user wants to store empty strings, |
|
|
2514 | * should pass in "" |
|
|
2515 | */ |
|
|
2516 | if (value == NULL) |
|
|
2517 | return TRUE; |
|
|
2518 | |
|
|
2519 | field = new key_value; |
|
|
2520 | |
|
|
2521 | field->key = canonical_key; |
|
|
2522 | field->value = value; |
|
|
2523 | /* Usual prepend-addition. */ |
|
|
2524 | field->next = op->key_values; |
|
|
2525 | op->key_values = field; |
|
|
2526 | |
|
|
2527 | return TRUE; |
|
|
2528 | } |
|
|
2529 | |
|
|
2530 | /* |
|
|
2531 | * Updates the key in op to value. |
|
|
2532 | * |
|
|
2533 | * If add_key is FALSE, this will only update existing keys, |
|
|
2534 | * and not add new ones. |
|
|
2535 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2536 | * |
|
|
2537 | * Returns TRUE on success. |
|
|
2538 | */ |
|
|
2539 | int |
|
|
2540 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2541 | { |
|
|
2542 | shstr key_ (key); |
|
|
2543 | |
|
|
2544 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2545 | } |
2395 | } |
2546 | |
2396 | |
2547 | object::depth_iterator::depth_iterator (object *container) |
2397 | object::depth_iterator::depth_iterator (object *container) |
2548 | : iterator_base (container) |
2398 | : iterator_base (container) |
2549 | { |
2399 | { |
… | |
… | |
2599 | { |
2449 | { |
2600 | char flagdesc[512]; |
2450 | char flagdesc[512]; |
2601 | char info2[256 * 4]; |
2451 | char info2[256 * 4]; |
2602 | char *p = info; |
2452 | char *p = info; |
2603 | |
2453 | |
2604 | p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2454 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2605 | count, uuid.seq, |
2455 | count, |
|
|
2456 | uuid.c_str (), |
2606 | &name, |
2457 | &name, |
2607 | title ? "\",title:\"" : "", |
2458 | title ? "\",title:\"" : "", |
2608 | title ? (const char *)title : "", |
2459 | title ? (const char *)title : "", |
2609 | flag_desc (flagdesc, 512), type); |
2460 | flag_desc (flagdesc, 512), type); |
2610 | |
2461 | |
2611 | if (!this->flag[FLAG_REMOVED] && env) |
2462 | if (!flag[FLAG_REMOVED] && env) |
2612 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2463 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2613 | |
2464 | |
2614 | if (map) |
2465 | if (map) |
2615 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2466 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2616 | |
2467 | |
… | |
… | |
2646 | object::open_container (object *new_container) |
2497 | object::open_container (object *new_container) |
2647 | { |
2498 | { |
2648 | if (container == new_container) |
2499 | if (container == new_container) |
2649 | return; |
2500 | return; |
2650 | |
2501 | |
2651 | if (object *old_container = container) |
2502 | object *old_container = container; |
|
|
2503 | |
|
|
2504 | if (old_container) |
2652 | { |
2505 | { |
2653 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2506 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2654 | return; |
2507 | return; |
2655 | |
2508 | |
2656 | #if 0 |
2509 | #if 0 |
… | |
… | |
2658 | if (object *closer = old_container->inv) |
2511 | if (object *closer = old_container->inv) |
2659 | if (closer->type == CLOSE_CON) |
2512 | if (closer->type == CLOSE_CON) |
2660 | closer->destroy (); |
2513 | closer->destroy (); |
2661 | #endif |
2514 | #endif |
2662 | |
2515 | |
|
|
2516 | // make sure the container is available |
|
|
2517 | esrv_send_item (this, old_container); |
|
|
2518 | |
2663 | old_container->flag [FLAG_APPLIED] = 0; |
2519 | old_container->flag [FLAG_APPLIED] = false; |
2664 | container = 0; |
2520 | container = 0; |
2665 | |
2521 | |
|
|
2522 | // client needs item update to make it work, client bug requires this to be separate |
2666 | esrv_update_item (UPD_FLAGS, this, old_container); |
2523 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2524 | |
2667 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2525 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2668 | play_sound (sound_find ("chest_close")); |
2526 | play_sound (sound_find ("chest_close")); |
2669 | } |
2527 | } |
2670 | |
2528 | |
2671 | if (new_container) |
2529 | if (new_container) |
… | |
… | |
2684 | } |
2542 | } |
2685 | #endif |
2543 | #endif |
2686 | |
2544 | |
2687 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2545 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2688 | |
2546 | |
|
|
2547 | // make sure the container is available, client bug requires this to be separate |
|
|
2548 | esrv_send_item (this, new_container); |
|
|
2549 | |
2689 | new_container->flag [FLAG_APPLIED] = 1; |
2550 | new_container->flag [FLAG_APPLIED] = true; |
2690 | container = new_container; |
2551 | container = new_container; |
2691 | |
2552 | |
|
|
2553 | // client needs flag change |
2692 | esrv_update_item (UPD_FLAGS, this, new_container); |
2554 | esrv_update_item (UPD_FLAGS, this, new_container); |
2693 | esrv_send_inventory (this, new_container); |
2555 | esrv_send_inventory (this, new_container); |
2694 | play_sound (sound_find ("chest_open")); |
2556 | play_sound (sound_find ("chest_open")); |
2695 | } |
2557 | } |
|
|
2558 | // else if (!old_container->env && contr && contr->ns) |
|
|
2559 | // contr->ns->floorbox_reset (); |
2696 | } |
2560 | } |
2697 | |
2561 | |
2698 | object * |
2562 | object * |
2699 | object::force_find (const shstr name) |
2563 | object::force_find (const shstr name) |
2700 | { |
2564 | { |
… | |
… | |
2726 | |
2590 | |
2727 | insert (force); |
2591 | insert (force); |
2728 | } |
2592 | } |
2729 | |
2593 | |
2730 | void |
2594 | void |
2731 | object::play_sound (faceidx sound) const |
2595 | object::play_sound (faceidx sound) |
2732 | { |
2596 | { |
2733 | if (!sound) |
2597 | if (!sound) |
2734 | return; |
2598 | return; |
2735 | |
2599 | |
2736 | if (flag [FLAG_REMOVED]) |
2600 | if (flag [FLAG_REMOVED]) |