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