1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * 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, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
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 Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /** |
25 | /** |
… | |
… | |
37 | #include <sproto.h> |
38 | #include <sproto.h> |
38 | |
39 | |
39 | /** This is the maximum number of bytes we expect any one item to take up */ |
40 | /** This is the maximum number of bytes we expect any one item to take up */ |
40 | #define MAXITEMLEN 300 |
41 | #define MAXITEMLEN 300 |
41 | |
42 | |
42 | #if 0 |
|
|
43 | tag_t |
|
|
44 | client_container::tag () const |
|
|
45 | { |
|
|
46 | switch (type) |
|
|
47 | { |
|
|
48 | case CC_INVENTORY: |
|
|
49 | return ns->pl->count; |
|
|
50 | case CC_MAPSPACE: |
|
|
51 | return 0; |
|
|
52 | case CC_CONTAINER: |
|
|
53 | return env->count; |
|
|
54 | } |
|
|
55 | |
|
|
56 | abort (); |
|
|
57 | } |
|
|
58 | |
|
|
59 | void |
|
|
60 | client_container::clear () |
|
|
61 | { |
|
|
62 | switch (type) |
|
|
63 | { |
|
|
64 | case CC_INVENTORY: |
|
|
65 | abort (); |
|
|
66 | |
|
|
67 | case CC_MAPSPACE: |
|
|
68 | case CC_CONTAINER: |
|
|
69 | ns->send_packet_printf ("delinv %d", tag ()); |
|
|
70 | break; |
|
|
71 | } |
|
|
72 | |
|
|
73 | for (iterator i = begin (); i != end (); ++i) |
|
|
74 | i->op->seen_by = 0; |
|
|
75 | |
|
|
76 | vector< refitem, slice_allocator<refitem> >::clear (); |
|
|
77 | } |
|
|
78 | |
|
|
79 | inline iterator |
|
|
80 | client_container::merge_item (iterator i, object *op) |
|
|
81 | { |
|
|
82 | if (i != end () && i->op == op) |
|
|
83 | return ++i; |
|
|
84 | |
|
|
85 | if (op->seen_by) |
|
|
86 | return; // seen by another entity already |
|
|
87 | |
|
|
88 | op->seen_by = this; |
|
|
89 | |
|
|
90 | refitem ref; |
|
|
91 | ref.op = op; |
|
|
92 | |
|
|
93 | return insert (i, ref); |
|
|
94 | } |
|
|
95 | |
|
|
96 | void |
|
|
97 | client_container::update (int offset) |
|
|
98 | { |
|
|
99 | iterator i = begin (); |
|
|
100 | |
|
|
101 | switch (type) |
|
|
102 | { |
|
|
103 | case CC_INVENTORY: |
|
|
104 | case CC_CONTAINER: |
|
|
105 | { |
|
|
106 | object *env = type == CC_INVENTORY |
|
|
107 | ? ns->pl->ob |
|
|
108 | : this->env; |
|
|
109 | |
|
|
110 | // pass 1, erase all objects no longer in container |
|
|
111 | for (iterator j = begin (); j != end (); ++j) |
|
|
112 | if (j->op->env != env) |
|
|
113 | { |
|
|
114 | j->op->seen_by = 0; |
|
|
115 | erase (j); |
|
|
116 | } |
|
|
117 | |
|
|
118 | // pass 2 merge items |
|
|
119 | for (object *op = env->inv; op; op = op->below) |
|
|
120 | { |
|
|
121 | if (--offset < 0) |
|
|
122 | i = merge_item (i, op); |
|
|
123 | else if (offset < -FLOORBOX_PAGESIZE) |
|
|
124 | break; |
|
|
125 | } |
|
|
126 | } |
|
|
127 | break; |
|
|
128 | |
|
|
129 | case CC_MAPSPACE: |
|
|
130 | { |
|
|
131 | // pass 1, erase all objects no longer on space |
|
|
132 | for (iterator j = begin (); j != end (); ++j) |
|
|
133 | if (j->op->x != x || j->op->y != y || j->op->map != map) |
|
|
134 | { |
|
|
135 | j->op->seen_by = 0; |
|
|
136 | erase (j); |
|
|
137 | } |
|
|
138 | |
|
|
139 | // pass 2 merge items |
|
|
140 | for (object *op = GET_MAP_OB (map, x, y); op; op = op->above) |
|
|
141 | { |
|
|
142 | if (--offset < 0) |
|
|
143 | i = merge_item (i, op); |
|
|
144 | else if (offset < -FLOORBOX_PAGESIZE) |
|
|
145 | break; |
|
|
146 | } |
|
|
147 | } |
|
|
148 | break; |
|
|
149 | } |
|
|
150 | |
|
|
151 | // pass 3, erase all extra items |
|
|
152 | for (iterator j = i; j != end (); ++j) |
|
|
153 | j->op->seen_by = 0; |
|
|
154 | |
|
|
155 | if (i != end ()) |
|
|
156 | erase (i, end ()); |
|
|
157 | } |
|
|
158 | |
|
|
159 | void |
|
|
160 | client_container::set_mapspace (maptile *map, int x, int y) |
|
|
161 | { |
|
|
162 | if (type == CC_MAPSPACE |
|
|
163 | && this->map == map |
|
|
164 | && this->x == x |
|
|
165 | && this->y == y) |
|
|
166 | return; |
|
|
167 | |
|
|
168 | clear (); |
|
|
169 | |
|
|
170 | type = CC_MAPSPACE; |
|
|
171 | this->map = map; |
|
|
172 | this->x = x; |
|
|
173 | this->y = y; |
|
|
174 | } |
|
|
175 | |
|
|
176 | void |
|
|
177 | client_container::set_container (object *env) |
|
|
178 | { |
|
|
179 | } |
|
|
180 | #endif |
|
|
181 | |
|
|
182 | /******************************************************************************* |
43 | /******************************************************************************* |
183 | * |
44 | * |
184 | * Functions related to sending object data to the client. |
45 | * Functions related to sending object data to the client. |
185 | * |
46 | * |
186 | ******************************************************************************/ |
47 | ******************************************************************************/ |
187 | |
48 | |
188 | /** |
49 | /** |
189 | * This is a similar to query_name, but returns flags |
50 | * This is a similar to query_name, but returns flags |
190 | * to be sent to client. |
51 | * to be sent to client. |
191 | */ |
52 | */ |
192 | unsigned int |
53 | static unsigned int |
193 | query_flags (object *op) |
54 | query_flags (object *op) |
194 | { |
55 | { |
195 | unsigned int flags = 0; |
56 | unsigned int flags = 0; |
196 | |
57 | |
197 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
58 | if (op->flag [FLAG_APPLIED]) |
198 | switch (op->type) |
59 | switch (op->type) |
199 | { |
60 | { |
200 | case BOW: |
61 | case BOW: |
201 | case WAND: |
62 | case WAND: |
202 | case ROD: |
63 | case ROD: |
… | |
… | |
225 | default: |
86 | default: |
226 | flags = a_applied; |
87 | flags = a_applied; |
227 | break; |
88 | break; |
228 | } |
89 | } |
229 | |
90 | |
230 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
91 | if (op->is_open_container ()) |
231 | flags |= F_OPEN; |
92 | flags |= F_OPEN; |
232 | |
93 | |
233 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
94 | if (op->flag [FLAG_KNOWN_CURSED]) |
234 | { |
95 | { |
235 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
96 | if (op->flag [FLAG_DAMNED]) |
236 | flags |= F_DAMNED; |
97 | flags |= F_DAMNED; |
237 | else if (QUERY_FLAG (op, FLAG_CURSED)) |
98 | else if (op->flag [FLAG_CURSED]) |
238 | flags |= F_CURSED; |
99 | flags |= F_CURSED; |
239 | } |
100 | } |
240 | |
101 | |
241 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
102 | if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED]) |
242 | flags |= F_MAGIC; |
103 | flags |= F_MAGIC; |
243 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
104 | if (op->flag [FLAG_UNPAID]) |
244 | flags |= F_UNPAID; |
105 | flags |= F_UNPAID; |
245 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
106 | if (op->flag [FLAG_INV_LOCKED]) |
246 | flags |= F_LOCKED; |
107 | flags |= F_LOCKED; |
247 | |
108 | |
248 | return flags; |
109 | return flags; |
249 | } |
110 | } |
250 | |
111 | |
… | |
… | |
253 | * animation of face to the client. |
114 | * animation of face to the client. |
254 | */ |
115 | */ |
255 | static void |
116 | static void |
256 | add_object_to_socklist (client &ns, packet &sl, object *head) |
117 | add_object_to_socklist (client &ns, packet &sl, object *head) |
257 | { |
118 | { |
258 | int flags, len, anim_speed; |
|
|
259 | char item_n[MAX_BUF]; |
|
|
260 | const char *item_p; |
|
|
261 | |
|
|
262 | flags = query_flags (head); |
119 | int flags = query_flags (head); |
263 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
120 | |
|
|
121 | if (head->flag [FLAG_NO_PICK]) |
264 | flags |= F_NOPICK; |
122 | flags |= F_NOPICK; |
265 | |
123 | |
266 | ns.send_face (head->face, -50); |
124 | ns.send_face (head->face, -50); |
267 | ns.flush_fx (); |
|
|
268 | |
125 | |
269 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
126 | if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id]) |
270 | ns.send_animation (head->animation_id); |
127 | ns.send_animation (head->animation_id); |
271 | |
128 | |
272 | sl << uint32 (head->count) |
129 | sl << uint32 (head->count) |
273 | << uint32 (flags) |
130 | << uint32 (flags) |
274 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) |
131 | << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ()) |
275 | << uint32 (head->face); |
132 | << uint32 (head->face); |
276 | |
133 | |
277 | if (!head->custom_name) |
134 | if (!head->custom_name) |
278 | { |
135 | { |
279 | strncpy (item_n, query_base_name (head, 0), 127); |
136 | const char *name; |
280 | item_n[127] = 0; |
137 | uint8 *len = sl.cur++; // patch up length later |
281 | len = strlen (item_n); |
138 | |
282 | item_p = query_base_name (head, 1); |
139 | name = query_base_name (head, 0); sl << data (name, min (127, strlen (name))); |
|
|
140 | sl << uint8 (0); |
|
|
141 | name = query_base_name (head, 1); sl << data (name, min (127, strlen (name))); |
|
|
142 | |
|
|
143 | *len = sl.cur - len - 1; |
283 | } |
144 | } |
284 | else |
145 | else |
285 | { |
146 | { |
286 | strncpy (item_n, head->custom_name, 127); |
147 | int len = min (head->custom_name.length (), 127); |
287 | item_n[127] = 0; |
|
|
288 | len = strlen (item_n); |
|
|
289 | item_p = head->custom_name; |
|
|
290 | } |
|
|
291 | |
148 | |
292 | strncpy (item_n + len + 1, item_p, 127); |
149 | sl << uint8 (len * 2 + 1) |
293 | item_n[254] = 0; |
150 | << data (head->custom_name, len) |
294 | len += strlen (item_n + 1 + len) + 1; |
151 | << uint8 (0) |
|
|
152 | << data (head->custom_name, len); |
|
|
153 | } |
295 | |
154 | |
296 | sl << data8 (item_n, len) |
|
|
297 | << uint16 (head->animation_id); |
155 | sl << uint16 (head->animation_id); |
298 | |
156 | |
299 | anim_speed = 0; |
157 | int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 |
300 | if (QUERY_FLAG (head, FLAG_ANIMATE)) |
158 | : head->anim_speed ? clamp (head->anim_speed, 1, 255) |
301 | { |
159 | : 1. / clamp (head->speed, 1./255., 1./1.); |
302 | if (head->anim_speed) |
|
|
303 | anim_speed = head->anim_speed; |
|
|
304 | else |
|
|
305 | { |
|
|
306 | if (fabs (head->speed) < 0.001) |
|
|
307 | anim_speed = 255; |
|
|
308 | else if (fabs (head->speed) >= 1.0) |
|
|
309 | anim_speed = 1; |
|
|
310 | else |
|
|
311 | anim_speed = (int) (1.0 / fabs (head->speed)); |
|
|
312 | } |
|
|
313 | |
|
|
314 | if (anim_speed > 255) |
|
|
315 | anim_speed = 255; |
|
|
316 | } |
|
|
317 | |
160 | |
318 | sl << uint8 (anim_speed) |
161 | sl << uint8 (anim_speed) |
319 | << uint32 (head->nrof); |
162 | << uint32 (head->nrof); |
320 | |
163 | |
321 | if (ns.itemcmd == 2) |
164 | if (ns.itemcmd == 2) |
322 | sl << uint16 (head->client_type); |
165 | sl << uint16 (head->client_type); |
323 | |
|
|
324 | SET_FLAG (head, FLAG_CLIENT_SENT); |
|
|
325 | } |
166 | } |
|
|
167 | |
|
|
168 | static faceidx |
|
|
169 | need_face_now (player *pl, const char *name) |
|
|
170 | { |
|
|
171 | faceidx face = face_find (name, empty_face); |
|
|
172 | |
|
|
173 | pl->ns->send_face (face, -50); |
|
|
174 | pl->ns->flush_fx (); |
|
|
175 | |
|
|
176 | return face; |
|
|
177 | } |
|
|
178 | |
|
|
179 | #define FINGER_UP "finger_up.x11" |
|
|
180 | #define FINGER_DOWN "finger_down.x11" |
326 | |
181 | |
327 | /** |
182 | /** |
328 | * Send the look window. Don't need to do animations here |
183 | * Send the look window. Don't need to do animations here |
329 | * This sends all the faces to the client, not just updates. This is |
184 | * This sends all the faces to the client, not just updates. This is |
330 | * because object ordering would otherwise be inconsistent. |
185 | * because object ordering would otherwise be inconsistent. |
331 | */ |
186 | */ |
332 | void |
187 | void |
333 | esrv_draw_look (player *pl) |
188 | esrv_draw_look (player *pl) |
334 | { |
189 | { |
335 | int got_one = 0, start_look = 0, end_look = 0; |
|
|
336 | |
|
|
337 | object *ob = pl->ob; |
190 | object *ob = pl->ob; |
338 | |
191 | |
339 | if (!pl->ns->update_look) |
192 | if (!pl->ns->update_look) |
340 | { |
193 | { |
341 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
194 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
342 | return; |
195 | return; |
343 | } |
196 | } |
344 | |
197 | |
|
|
198 | if (pl->ns->need_delinv0) |
|
|
199 | { |
|
|
200 | pl->ns->need_delinv0 = 0; |
|
|
201 | pl->ns->send_packet ("delinv 0"); |
|
|
202 | } |
|
|
203 | |
|
|
204 | if (pl->run_on) |
|
|
205 | return; |
|
|
206 | |
345 | pl->ns->update_look = 0; |
207 | pl->ns->update_look = 0; |
|
|
208 | pl->ns->need_delinv0 = 1; |
346 | |
209 | |
347 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
210 | if (ob->flag [FLAG_REMOVED] |
348 | || !ob->map |
211 | || !ob->map |
349 | || ob->map->in_memory != MAP_ACTIVE |
212 | || ob->map->state != MAP_ACTIVE |
350 | || out_of_map (ob->map, ob->x, ob->y)) |
213 | || out_of_map (ob->map, ob->x, ob->y)) |
351 | return; |
214 | return; |
352 | |
|
|
353 | pl->ns->send_packet ("delinv 0"); |
|
|
354 | |
215 | |
355 | packet sl; |
216 | packet sl; |
356 | sl.printf ("item%d ", pl->ns->itemcmd); |
217 | sl.printf ("item%d ", pl->ns->itemcmd); |
357 | |
218 | |
358 | sl << uint32 (0); |
219 | sl << uint32 (0); |
359 | |
220 | |
360 | pl->ns->send_face (empty_face, -50); |
221 | int start_pos = pl->ns->look_position; |
361 | pl->ns->flush_fx (); |
222 | bool dirty = false; |
362 | |
223 | |
363 | if (pl->ns->look_position) |
224 | mapspace &ms = ob->ms (); |
|
|
225 | |
|
|
226 | // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and |
|
|
227 | // start from the top |
|
|
228 | object *items [FLOORBOX_PAGESIZE]; |
|
|
229 | int item_idx = 0, item_cnt = 0; |
|
|
230 | int pos = 0; |
|
|
231 | |
|
|
232 | // find our items by walking down |
|
|
233 | object *item = ms.top; |
|
|
234 | |
|
|
235 | for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below) |
|
|
236 | { |
|
|
237 | if (!item->client_visible ()) |
|
|
238 | continue; |
|
|
239 | |
|
|
240 | if (++pos < start_pos) |
|
|
241 | continue; |
|
|
242 | |
|
|
243 | // record item |
|
|
244 | items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0; |
|
|
245 | item_cnt++; |
|
|
246 | |
|
|
247 | // stop at first floor |
|
|
248 | if (item->flag [FLAG_IS_FLOOR]) |
|
|
249 | { |
|
|
250 | // we are finished, don't append "next group of items" |
|
|
251 | // by setting item to ms.bot it becomes zero which is checked after the while loop |
|
|
252 | item = ms.bot; |
|
|
253 | } |
364 | { |
254 | } |
365 | char buf[80]; |
|
|
366 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
|
|
367 | |
255 | |
|
|
256 | // see if there are more if we cared - we ignore invisible objects |
|
|
257 | if (item) |
|
|
258 | { |
|
|
259 | /* What we basically do is make a 'fake' object - when the user applies it, |
|
|
260 | * we notice the special tag the object has, and act accordingly. |
|
|
261 | */ |
368 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
262 | sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE)) |
369 | << uint32 (0) |
263 | << uint32 (0) |
370 | << sint32 (-1) |
264 | << uint32 ((uint32) - 1) |
371 | << uint32 (empty_face) |
265 | << uint32 (need_face_now (pl, FINGER_DOWN)) |
372 | << data8 (buf) |
266 | << data8 ("Apply this to see the items below") |
373 | << uint16 (0) |
267 | << uint16 (0) |
374 | << uint8 (0) |
268 | << uint8 (0) |
375 | << uint32 (0); |
269 | << uint32 (0); |
376 | |
270 | |
377 | if (pl->ns->itemcmd == 2) |
271 | if (pl->ns->itemcmd == 2) |
378 | sl << uint16 (0); |
272 | sl << uint16 (0); |
379 | } |
|
|
380 | |
273 | |
381 | object *tmp = ob->ms ().top; |
274 | dirty = true; |
382 | for (object *last = 0; tmp != last; tmp = tmp->below) |
|
|
383 | { |
275 | } |
384 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
276 | |
|
|
277 | // now send out all items in the ring buffer in reverse order |
|
|
278 | while (item_cnt) |
|
|
279 | { |
|
|
280 | --item_cnt; |
|
|
281 | item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1; |
|
|
282 | object *item = items [item_idx]; |
|
|
283 | |
|
|
284 | add_object_to_socklist (*pl->ns, sl, item->head_ ()); |
|
|
285 | |
|
|
286 | dirty = true; |
|
|
287 | |
|
|
288 | // if packet got too large, send it and begin a new one |
|
|
289 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
385 | { |
290 | { |
386 | last = tmp->below; /* assumes double floor mode */ |
291 | pl->ns->flush_fx (); |
387 | if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) |
292 | pl->ns->send_packet (sl); |
388 | last = last->below; |
293 | |
|
|
294 | sl.reset (); |
|
|
295 | sl.printf ("item%d ", pl->ns->itemcmd); |
|
|
296 | sl << uint32 (0); |
|
|
297 | |
|
|
298 | dirty = false; |
389 | } |
299 | } |
390 | |
|
|
391 | if (tmp->client_visible ()) |
|
|
392 | { |
|
|
393 | if (++start_look < pl->ns->look_position) |
|
|
394 | continue; |
|
|
395 | |
|
|
396 | end_look++; |
|
|
397 | |
|
|
398 | if (end_look > FLOORBOX_PAGESIZE) |
|
|
399 | { |
|
|
400 | /* What we basically do is make a 'fake' object - when the user applies it, |
|
|
401 | * we notice the special tag the object has, and act accordingly. |
|
|
402 | */ |
|
|
403 | sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) |
|
|
404 | << uint32 (0) |
|
|
405 | << uint32 ((uint32) - 1) |
|
|
406 | << uint32 (empty_face) |
|
|
407 | << data8 ("Apply this to see next group of items") |
|
|
408 | << uint16 (0) |
|
|
409 | << uint8 (0) |
|
|
410 | << uint32 (0); |
|
|
411 | |
|
|
412 | if (pl->ns->itemcmd == 2) |
|
|
413 | sl << uint16 (0); |
|
|
414 | |
|
|
415 | break; |
|
|
416 | } |
|
|
417 | |
|
|
418 | add_object_to_socklist (*pl->ns, sl, tmp->head_ ()); |
|
|
419 | got_one++; |
|
|
420 | |
|
|
421 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
|
|
422 | { |
|
|
423 | pl->ns->send_packet (sl); |
|
|
424 | |
|
|
425 | sl.reset (); |
|
|
426 | sl.printf ("item%d ", pl->ns->itemcmd); |
|
|
427 | sl << uint32 (0); |
|
|
428 | got_one = 0; |
|
|
429 | } |
|
|
430 | } |
|
|
431 | } |
300 | } |
432 | |
301 | |
433 | if (got_one) |
302 | if (start_pos) |
|
|
303 | { |
|
|
304 | sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE)) |
|
|
305 | << uint32 (0) |
|
|
306 | << sint32 (-1) |
|
|
307 | << uint32 (need_face_now (pl, FINGER_UP)) |
|
|
308 | << data8 ("Apply this to see the items higher up") |
|
|
309 | << uint16 (0) |
|
|
310 | << uint8 (0) |
|
|
311 | << uint32 (0); |
|
|
312 | |
|
|
313 | if (pl->ns->itemcmd == 2) |
|
|
314 | sl << uint16 (0); |
|
|
315 | |
|
|
316 | dirty = true; |
|
|
317 | } |
|
|
318 | |
|
|
319 | if (dirty) |
|
|
320 | { |
|
|
321 | pl->ns->flush_fx (); |
434 | pl->ns->send_packet (sl); |
322 | pl->ns->send_packet (sl); |
435 | |
323 | } |
436 | } |
324 | } |
437 | |
325 | |
438 | /** |
326 | /** |
439 | * Sends whole inventory. |
327 | * Sends whole inventory. |
440 | */ |
328 | */ |
… | |
… | |
472 | * items (especially with some of the bags out there) to |
360 | * items (especially with some of the bags out there) to |
473 | * overflow the buffer. IF so, send multiple item commands. |
361 | * overflow the buffer. IF so, send multiple item commands. |
474 | */ |
362 | */ |
475 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
363 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
476 | { |
364 | { |
|
|
365 | pl->contr->ns->flush_fx (); |
477 | pl->contr->ns->send_packet (sl); |
366 | pl->contr->ns->send_packet (sl); |
478 | |
367 | |
479 | sl.reset (); |
368 | sl.reset (); |
480 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
369 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
481 | sl << uint32 (op->count); |
370 | sl << uint32 (op->count); |
… | |
… | |
483 | } |
372 | } |
484 | } |
373 | } |
485 | } |
374 | } |
486 | |
375 | |
487 | if (got_one) |
376 | if (got_one) |
|
|
377 | { |
|
|
378 | pl->contr->ns->flush_fx (); |
488 | pl->contr->ns->send_packet (sl); |
379 | pl->contr->ns->send_packet (sl); |
|
|
380 | } |
489 | } |
381 | } |
490 | |
382 | |
491 | /** |
383 | /** |
492 | * Updates object *op for player *pl. |
384 | * Updates object *op for player *pl. |
493 | * |
385 | * |
… | |
… | |
504 | |
396 | |
505 | client *ns = pl->contr->ns; |
397 | client *ns = pl->contr->ns; |
506 | if (!ns) |
398 | if (!ns) |
507 | return; |
399 | return; |
508 | |
400 | |
509 | if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) |
|
|
510 | { |
|
|
511 | /* FLAG_CLIENT_SENT is debug only. We are using it to see where |
|
|
512 | * this is happening - we can set a breakpoint here in the debugger |
|
|
513 | * and track back the call. |
|
|
514 | */ |
|
|
515 | LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); |
|
|
516 | } |
|
|
517 | |
|
|
518 | packet sl ("upditem"); |
401 | packet sl ("upditem"); |
519 | |
402 | |
520 | sl << uint8 (flags); |
403 | sl << uint8 (flags); |
521 | |
404 | |
522 | op = op->head_ (); |
405 | op = op->head_ (); |
… | |
… | |
529 | if (flags & UPD_FLAGS) |
412 | if (flags & UPD_FLAGS) |
530 | sl << uint32 (query_flags (op)); |
413 | sl << uint32 (query_flags (op)); |
531 | |
414 | |
532 | if (flags & UPD_WEIGHT) |
415 | if (flags & UPD_WEIGHT) |
533 | { |
416 | { |
534 | sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); |
417 | sint32 weight = op->client_weight (); |
535 | |
418 | |
536 | if (op) |
419 | if (op == pl) |
537 | ns->last_weight = weight; |
420 | ns->last_weight = weight; |
538 | |
421 | |
539 | sl << uint32 (weight); |
422 | sl << uint32 (weight); |
540 | } |
423 | } |
541 | |
424 | |
… | |
… | |
548 | |
431 | |
549 | if (flags & UPD_NAME) |
432 | if (flags & UPD_NAME) |
550 | { |
433 | { |
551 | int len; |
434 | int len; |
552 | const char *item_p; |
435 | const char *item_p; |
553 | char item_n[MAX_BUF]; |
436 | char item_n[127 * 2]; |
554 | |
437 | |
555 | if (!op->custom_name) |
438 | if (!op->custom_name) |
556 | { |
439 | { |
557 | strncpy (item_n, query_base_name (op, 0), 127); |
440 | len = assign (item_n, query_base_name (op, 0), 127); |
558 | item_n[127] = 0; |
|
|
559 | len = strlen (item_n); |
|
|
560 | item_p = query_base_name (op, 1); |
441 | item_p = query_base_name (op, 1); |
561 | } |
442 | } |
562 | else |
443 | else |
563 | { |
444 | { |
564 | strncpy (item_n, op->custom_name, 127); |
445 | len = assign (item_n, &op->custom_name, 127); |
565 | item_n[127] = 0; |
|
|
566 | len = strlen (item_n); |
|
|
567 | item_p = op->custom_name; |
446 | item_p = &op->custom_name; |
568 | } |
447 | } |
569 | |
448 | |
570 | strncpy (item_n + len + 1, item_p, 127); |
449 | len += assign (item_n + len, item_p, 127); |
571 | item_n[254] = 0; |
|
|
572 | len += strlen (item_n + 1 + len) + 1; |
|
|
573 | |
450 | |
574 | sl << data8 (item_n, len); |
451 | sl << data8 (item_n, len); |
575 | } |
452 | } |
576 | |
453 | |
577 | if (flags & UPD_ANIM) |
454 | if (flags & UPD_ANIM) |
… | |
… | |
579 | |
456 | |
580 | if (flags & UPD_ANIMSPEED) |
457 | if (flags & UPD_ANIMSPEED) |
581 | { |
458 | { |
582 | int anim_speed = 0; |
459 | int anim_speed = 0; |
583 | |
460 | |
584 | if (QUERY_FLAG (op, FLAG_ANIMATE)) |
461 | if (op->flag [FLAG_ANIMATE]) |
585 | { |
462 | { |
586 | if (op->anim_speed) |
463 | if (op->anim_speed) |
587 | anim_speed = op->anim_speed; |
464 | anim_speed = op->anim_speed; |
588 | else |
465 | else |
589 | { |
466 | { |
590 | if (fabs (op->speed) < 0.001) |
467 | if (op->speed < 0.001) |
591 | anim_speed = 255; |
468 | anim_speed = 255; |
592 | else if (fabs (op->speed) >= 1.0) |
469 | else if (op->speed >= 1.0) |
593 | anim_speed = 1; |
470 | anim_speed = 1; |
594 | else |
471 | else |
595 | anim_speed = (int) (1.0 / fabs (op->speed)); |
472 | anim_speed = 1. / op->speed; |
596 | } |
473 | } |
597 | |
474 | |
598 | if (anim_speed > 255) |
475 | if (anim_speed > 255) |
599 | anim_speed = 255; |
476 | anim_speed = 255; |
600 | } |
477 | } |
… | |
… | |
629 | |
506 | |
630 | sl << uint32 (op->env ? op->env->count : 0); |
507 | sl << uint32 (op->env ? op->env->count : 0); |
631 | |
508 | |
632 | add_object_to_socklist (*pl->contr->ns, sl, op); |
509 | add_object_to_socklist (*pl->contr->ns, sl, op); |
633 | |
510 | |
|
|
511 | pl->contr->ns->flush_fx (); |
634 | pl->contr->ns->send_packet (sl); |
512 | pl->contr->ns->send_packet (sl); |
635 | SET_FLAG (op, FLAG_CLIENT_SENT); |
|
|
636 | } |
513 | } |
637 | |
514 | |
638 | /** |
515 | /** |
639 | * Tells the client to delete an item. |
516 | * Tells the client to delete an item. |
640 | */ |
517 | */ |
… | |
… | |
660 | |
537 | |
661 | /** |
538 | /** |
662 | * Takes a player and object count (tag) and returns the actual object |
539 | * Takes a player and object count (tag) and returns the actual object |
663 | * pointer, or null if it can't be found. |
540 | * pointer, or null if it can't be found. |
664 | */ |
541 | */ |
665 | object * |
542 | static object * |
666 | esrv_get_ob_from_count (object *pl, tag_t count) |
543 | esrv_get_ob_from_count (object *pl, tag_t count) |
667 | { |
544 | { |
668 | if (pl->count == count) |
545 | if (pl->count == count) |
669 | return pl; |
546 | return pl; |
670 | |
547 | |
671 | for (object *op = pl->inv; op; op = op->below) |
548 | for (object *op = pl->inv; op; op = op->below) |
672 | if (op->count == count) |
549 | if (op->count == count) |
673 | return op; |
550 | return op; |
674 | else if (op->type == CONTAINER && pl->container == op) |
551 | else if (op->type == CONTAINER && pl->container_ () == op) |
675 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
552 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
676 | if (tmp->count == count) |
553 | if (tmp->count == count) |
677 | return tmp; |
554 | return tmp; |
678 | |
555 | |
679 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
556 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
680 | if (op->head && op->head->count == count) |
557 | if (op->head && op->head->count == count) |
681 | return op; |
558 | return op; |
682 | else if (op->count == count) |
559 | else if (op->count == count) |
683 | return op; |
560 | return op; |
684 | else if (op->type == CONTAINER && pl->container == op) |
561 | else if (op->type == CONTAINER && pl->container_ () == op) |
685 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
562 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
686 | if (tmp->count == count) |
563 | if (tmp->count == count) |
687 | return tmp; |
564 | return tmp; |
688 | |
565 | |
689 | #if 0 |
566 | #if 0 |
… | |
… | |
699 | void |
576 | void |
700 | ExamineCmd (char *buf, int len, player *pl) |
577 | ExamineCmd (char *buf, int len, player *pl) |
701 | { |
578 | { |
702 | tag_t tag = atoi (buf); |
579 | tag_t tag = atoi (buf); |
703 | |
580 | |
704 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
|
|
705 | |
|
|
706 | if (!op) |
|
|
707 | { |
|
|
708 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
|
|
709 | return; |
|
|
710 | } |
|
|
711 | |
|
|
712 | examine (pl->ob, op); |
|
|
713 | } |
|
|
714 | |
|
|
715 | /** Client wants to examine some object. So lets do so. */ |
|
|
716 | void |
|
|
717 | ExCmd (char *buf, int len, player *pl) |
|
|
718 | { |
|
|
719 | tag_t tag = atoi (buf); |
|
|
720 | |
|
|
721 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
|
|
722 | { |
|
|
723 | std::string s = op->describe (pl->ob); |
|
|
724 | |
|
|
725 | packet sl ("ex"); |
|
|
726 | sl << ber32 (tag) << s.c_str (); |
|
|
727 | |
|
|
728 | pl->ns->send_packet (sl); |
|
|
729 | } |
|
|
730 | } |
|
|
731 | |
|
|
732 | /** Client wants to apply some object. Lets do so. */ |
|
|
733 | void |
|
|
734 | ApplyCmd (char *buf, int len, player *pl) |
|
|
735 | { |
|
|
736 | tag_t tag = atoi (buf); |
|
|
737 | |
|
|
738 | /* sort of a hack, but if the player saves and the player then manually |
|
|
739 | * applies a savebed (or otherwise tries to do stuff), we run into trouble. |
|
|
740 | */ |
|
|
741 | if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
|
|
742 | return; |
|
|
743 | |
|
|
744 | /* If the high bit is set, player applied a pseudo object. */ |
581 | /* If the high bit is set, player applied a pseudo object. */ |
745 | if (tag & 0x80000000) |
582 | if (tag & 0x80000000) |
746 | { |
583 | { |
747 | pl->ns->look_position = tag & 0x7fffffff; |
584 | pl->ns->look_position = tag & 0x7fffffff; |
748 | pl->ns->floorbox_update (); |
585 | pl->ns->floorbox_update (); |
… | |
… | |
751 | |
588 | |
752 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
589 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
753 | |
590 | |
754 | if (!op) |
591 | if (!op) |
755 | { |
592 | { |
756 | LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); |
593 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
757 | return; |
594 | return; |
|
|
595 | } |
|
|
596 | |
|
|
597 | examine (pl->ob, op); |
|
|
598 | } |
|
|
599 | |
|
|
600 | /** Client wants to examine some object. So lets do so. */ |
|
|
601 | void |
|
|
602 | ExCmd (char *buf, int len, player *pl) |
|
|
603 | { |
|
|
604 | tag_t tag = atoi (buf); |
|
|
605 | |
|
|
606 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
758 | } |
607 | { |
|
|
608 | std::string s = op->describe (pl->ob); |
759 | |
609 | |
760 | player_apply (pl->ob, op, 0, 0); |
610 | packet sl ("ex"); |
|
|
611 | sl << ber32 (tag) |
|
|
612 | << data (*pl->expand_cfpod (s.c_str ())); |
|
|
613 | |
|
|
614 | pl->ns->send_packet (sl); |
|
|
615 | } |
|
|
616 | } |
|
|
617 | |
|
|
618 | /** Client wants to apply some object. Lets do so. */ |
|
|
619 | void |
|
|
620 | ApplyCmd (char *buf, int len, player *pl) |
|
|
621 | { |
|
|
622 | tag_t tag = atoi (buf); |
|
|
623 | |
|
|
624 | /* If the high bit is set, player applied a pseudo object. */ |
|
|
625 | if (tag & 0x80000000) |
|
|
626 | { |
|
|
627 | pl->ns->look_position = tag & 0x7fffffff; |
|
|
628 | pl->ns->floorbox_update (); |
|
|
629 | return; |
|
|
630 | } |
|
|
631 | |
|
|
632 | // the object might be legally gone already |
|
|
633 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
|
|
634 | pl->ob->apply (op, AP_TOGGLE); |
761 | } |
635 | } |
762 | |
636 | |
763 | /** Client wants to lock some object. Lets do so. */ |
637 | /** Client wants to lock some object. Lets do so. */ |
764 | void |
638 | void |
765 | LockItem (char *data, int len, player *pl) |
639 | LockItem (char *data, int len, player *pl) |
… | |
… | |
773 | pl->failmsg ("Could not find object to lock/unlock"); |
647 | pl->failmsg ("Could not find object to lock/unlock"); |
774 | return; |
648 | return; |
775 | } |
649 | } |
776 | |
650 | |
777 | if (!flag) |
651 | if (!flag) |
778 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
652 | op->clr_flag (FLAG_INV_LOCKED); |
779 | else |
653 | else |
780 | SET_FLAG (op, FLAG_INV_LOCKED); |
654 | op->set_flag (FLAG_INV_LOCKED); |
781 | |
655 | |
782 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
656 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
783 | } |
657 | } |
784 | |
658 | |
785 | /** Client wants to mark some object. Lets do so. */ |
659 | /** Client wants to mark some object. Lets do so. */ |
… | |
… | |
806 | * Tero.Haatanen@lut.fi ] |
680 | * Tero.Haatanen@lut.fi ] |
807 | */ |
681 | */ |
808 | static void |
682 | static void |
809 | look_at (player *pl, int dx, int dy) |
683 | look_at (player *pl, int dx, int dy) |
810 | { |
684 | { |
811 | dynbuf_text buf; |
685 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
812 | object *ob = pl->ob; |
686 | object *ob = pl->ob; |
813 | |
687 | |
814 | if (!pl->observe->map) |
688 | if (!pl->observe->map) |
815 | return; |
689 | return; |
|
|
690 | |
|
|
691 | bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK]; |
816 | |
692 | |
817 | mapxy pos (pl->observe); |
693 | mapxy pos (pl->observe); |
818 | pos.move (dx, dy); |
694 | pos.move (dx, dy); |
819 | |
695 | |
|
|
696 | if (wiz) |
|
|
697 | { |
820 | if (pos.normalise ()) |
698 | if (pos.normalise ()) |
|
|
699 | { |
|
|
700 | mapspace &ms = *pos; |
|
|
701 | ms.update (); |
|
|
702 | |
|
|
703 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
|
|
704 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n", |
|
|
705 | &pos.m->path, pos.x, pos.y, dx, dy, |
|
|
706 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
|
|
707 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume () |
|
|
708 | ); |
|
|
709 | } |
|
|
710 | else |
|
|
711 | buf << "off-map\n\n"; |
|
|
712 | } |
|
|
713 | |
|
|
714 | int darkness = pl->blocked_los (dx, dy); |
|
|
715 | |
|
|
716 | if (darkness == LOS_BLOCKED) |
|
|
717 | buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>"; |
|
|
718 | else if (darkness == LOS_MAX) |
|
|
719 | buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>"; |
|
|
720 | else |
|
|
721 | { |
|
|
722 | if (pos.normalise ()) |
821 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
723 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
822 | { |
724 | { |
823 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
725 | if (tmp->invisible && !ob->flag [FLAG_WIZ]) |
824 | continue; |
726 | continue; |
825 | |
727 | |
826 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
728 | if (wiz) |
827 | buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); |
729 | buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ()); |
828 | else |
730 | else |
829 | buf.printf ("- %s.\n", query_name (tmp)); |
731 | buf.printf (" - %s.\n", query_name (tmp)); |
830 | |
732 | |
831 | object *head = tmp->head_ (); |
733 | object *head = tmp->head_ (); |
832 | |
734 | |
833 | if (head->inv) |
735 | if (head->inv) |
834 | if ((head->type != CONTAINER && head->type != FLESH) |
736 | if ((head->type != CONTAINER && head->type != FLESH) |
835 | || QUERY_FLAG (ob, FLAG_WIZ)) |
737 | || ob->flag [FLAG_WIZ]) |
836 | buf << head->query_inventory (ob, " "); |
738 | buf << head->query_inventory (ob, " "); |
837 | |
739 | |
838 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
740 | if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */ |
839 | break; |
741 | break; |
|
|
742 | } |
840 | } |
743 | } |
841 | |
744 | |
842 | if (buf.empty ()) |
745 | if (buf.empty ()) |
843 | pl->failmsg ("You see nothing there."); |
746 | buf << "You see nothing there."; |
844 | else |
747 | |
845 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
748 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
846 | } |
749 | } |
847 | |
750 | |
848 | /** Client wants to look at some object. Lets do so. */ |
751 | /** Client wants to look at some object. Lets do so. */ |
849 | void |
752 | void |
850 | LookAt (char *buf, int len, player *pl) |
753 | LookAt (char *buf, int len, player *pl) |
… | |
… | |
855 | if (!(cp = strchr (buf, ' '))) |
758 | if (!(cp = strchr (buf, ' '))) |
856 | return; |
759 | return; |
857 | |
760 | |
858 | int dy = atoi (cp); |
761 | int dy = atoi (cp); |
859 | |
762 | |
860 | if (player *opl = pl->observe->contr) |
|
|
861 | if (client *ns = opl->ns) |
|
|
862 | { |
|
|
863 | if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) |
|
|
864 | return; |
|
|
865 | |
|
|
866 | if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) |
|
|
867 | return; |
|
|
868 | } |
|
|
869 | |
|
|
870 | look_at (pl, dx, dy); |
763 | look_at (pl, dx, dy); |
871 | } |
764 | } |
872 | |
765 | |
873 | /** Move an object to a new location */ |
766 | /** Move an object to a new location */ |
874 | void |
767 | void |
875 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
768 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
876 | { |
769 | { |
877 | object *op, *env; |
|
|
878 | |
|
|
879 | op = esrv_get_ob_from_count (pl, tag); |
770 | object *op = esrv_get_ob_from_count (pl, tag); |
880 | if (!op) |
771 | if (!op) |
881 | { |
772 | { |
882 | LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); |
773 | LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); |
883 | return; |
774 | return; |
884 | } |
775 | } |
… | |
… | |
889 | return; |
780 | return; |
890 | |
781 | |
891 | /* If it is an active container, then we should drop all objects |
782 | /* If it is an active container, then we should drop all objects |
892 | * in the container and not the container itself. |
783 | * in the container and not the container itself. |
893 | */ |
784 | */ |
894 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
785 | if (op->inv && op->flag [FLAG_APPLIED]) |
895 | { |
786 | { |
896 | int cnt = MAX_ITEM_PER_DROP; |
787 | int cnt = MAX_ITEM_PER_ACTION; |
897 | |
788 | |
898 | for (object *current = op->inv; current; ) |
789 | for (object *current = op->inv; current && cnt--; ) |
899 | { |
790 | { |
900 | object *next = current->below; |
791 | object *next = current->below; |
901 | |
|
|
902 | drop_object (pl, current, 0); |
792 | drop_object (pl, current, 0); |
903 | |
|
|
904 | if (--cnt <= 0) break; |
|
|
905 | |
|
|
906 | current = next; |
793 | current = next; |
907 | } |
794 | } |
908 | |
795 | |
909 | if (cnt <= 0) |
796 | if (cnt <= 0) |
910 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
797 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
… | |
… | |
923 | pl->contr->count = nrof; |
810 | pl->contr->count = nrof; |
924 | pick_up (pl, op); |
811 | pick_up (pl, op); |
925 | return; |
812 | return; |
926 | } |
813 | } |
927 | |
814 | |
928 | env = esrv_get_ob_from_count (pl, to); |
815 | object *env = esrv_get_ob_from_count (pl, to); |
929 | if (!env) |
816 | if (!env) |
930 | { |
817 | { |
931 | LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); |
818 | LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); |
932 | return; |
819 | return; |
933 | } |
820 | } |