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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | 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 |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | 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 |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * |
20 | |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
|
|
22 | */ |
22 | */ |
23 | |
23 | |
24 | /** |
24 | /** |
25 | * \file |
25 | * \file |
26 | * Client/server logic. |
26 | * Client/server logic. |
27 | * |
27 | * |
28 | * \date 2003-12-02 |
28 | * \date 2003-12-02 |
29 | * |
29 | * |
30 | * This containes item logic for client/server. It doesn't contain |
30 | * This contains item logic for client/server. It doesn't contain |
31 | * the actual commands that send the data, but does contain |
31 | * the actual commands that send the data, but does contain |
32 | * the logic for what items should be sent. |
32 | * the logic for what items should be sent. |
33 | */ |
33 | */ |
34 | |
34 | |
35 | #include <global.h> |
35 | #include <global.h> |
36 | #include <object.h> /* LOOK_OBJ */ |
36 | #include <object.h> |
37 | #include <sproto.h> |
37 | #include <sproto.h> |
38 | |
38 | |
39 | /** 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 */ |
40 | #define MAXITEMLEN 300 |
40 | #define MAXITEMLEN 300 |
|
|
41 | |
|
|
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 |
41 | |
181 | |
42 | /******************************************************************************* |
182 | /******************************************************************************* |
43 | * |
183 | * |
44 | * Functions related to sending object data to the client. |
184 | * Functions related to sending object data to the client. |
45 | * |
185 | * |
… | |
… | |
53 | query_flags (object *op) |
193 | query_flags (object *op) |
54 | { |
194 | { |
55 | unsigned int flags = 0; |
195 | unsigned int flags = 0; |
56 | |
196 | |
57 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
197 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
58 | { |
|
|
59 | switch (op->type) |
198 | switch (op->type) |
60 | { |
199 | { |
61 | case BOW: |
200 | case BOW: |
62 | case WAND: |
201 | case WAND: |
63 | case ROD: |
202 | case ROD: |
64 | case HORN: |
203 | case HORN: |
65 | flags = a_readied; |
204 | flags = a_readied; |
66 | break; |
205 | break; |
67 | case WEAPON: |
206 | case WEAPON: |
68 | flags = a_wielded; |
207 | flags = a_wielded; |
69 | break; |
208 | break; |
70 | case SKILL: |
209 | case SKILL: |
71 | case ARMOUR: |
210 | case ARMOUR: |
72 | case HELMET: |
211 | case HELMET: |
73 | case SHIELD: |
212 | case SHIELD: |
74 | case RING: |
213 | case RING: |
75 | case BOOTS: |
214 | case BOOTS: |
76 | case GLOVES: |
215 | case GLOVES: |
77 | case AMULET: |
216 | case AMULET: |
78 | case GIRDLE: |
217 | case GIRDLE: |
79 | case BRACERS: |
218 | case BRACERS: |
80 | case CLOAK: |
219 | case CLOAK: |
81 | flags = a_worn; |
220 | flags = a_worn; |
82 | break; |
221 | break; |
83 | case CONTAINER: |
222 | case CONTAINER: |
84 | flags = a_active; |
223 | flags = a_active; |
85 | break; |
224 | break; |
86 | default: |
225 | default: |
87 | flags = a_applied; |
226 | flags = a_applied; |
88 | break; |
227 | break; |
89 | } |
228 | } |
90 | } |
|
|
91 | |
229 | |
92 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
230 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
93 | flags |= F_OPEN; |
231 | flags |= F_OPEN; |
94 | |
232 | |
95 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
233 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
… | |
… | |
123 | |
261 | |
124 | flags = query_flags (head); |
262 | flags = query_flags (head); |
125 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
263 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
126 | flags |= F_NOPICK; |
264 | flags |= F_NOPICK; |
127 | |
265 | |
128 | if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) |
266 | ns.send_face (head->face, -50); |
129 | esrv_send_face (&ns, head->face->number, 0); |
267 | ns.flush_fx (); |
130 | |
268 | |
131 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
269 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
132 | esrv_send_animation (&ns, head->animation_id); |
270 | ns.send_animation (head->animation_id); |
133 | |
271 | |
134 | sl << uint32 (head->count) |
272 | sl << uint32 (head->count) |
135 | << uint32 (flags) |
273 | << uint32 (flags) |
136 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) |
274 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) |
137 | << uint32 (head->face->number); |
275 | << uint32 (head->face); |
138 | |
276 | |
139 | if (!head->custom_name) |
277 | if (!head->custom_name) |
140 | { |
278 | { |
141 | strncpy (item_n, query_base_name (head, 0), 127); |
279 | strncpy (item_n, query_base_name (head, 0), 127); |
142 | item_n[127] = 0; |
280 | item_n[127] = 0; |
… | |
… | |
163 | { |
301 | { |
164 | if (head->anim_speed) |
302 | if (head->anim_speed) |
165 | anim_speed = head->anim_speed; |
303 | anim_speed = head->anim_speed; |
166 | else |
304 | else |
167 | { |
305 | { |
168 | if (FABS (head->speed) < 0.001) |
306 | if (fabs (head->speed) < 0.001) |
169 | anim_speed = 255; |
307 | anim_speed = 255; |
170 | else if (FABS (head->speed) >= 1.0) |
308 | else if (fabs (head->speed) >= 1.0) |
171 | anim_speed = 1; |
309 | anim_speed = 1; |
172 | else |
310 | else |
173 | anim_speed = (int) (1.0 / FABS (head->speed)); |
311 | anim_speed = (int) (1.0 / fabs (head->speed)); |
174 | } |
312 | } |
175 | |
313 | |
176 | if (anim_speed > 255) |
314 | if (anim_speed > 255) |
177 | anim_speed = 255; |
315 | anim_speed = 255; |
178 | } |
316 | } |
… | |
… | |
183 | if (ns.itemcmd == 2) |
321 | if (ns.itemcmd == 2) |
184 | sl << uint16 (head->client_type); |
322 | sl << uint16 (head->client_type); |
185 | |
323 | |
186 | SET_FLAG (head, FLAG_CLIENT_SENT); |
324 | SET_FLAG (head, FLAG_CLIENT_SENT); |
187 | } |
325 | } |
188 | |
|
|
189 | |
326 | |
190 | /** |
327 | /** |
191 | * Send the look window. Don't need to do animations here |
328 | * Send the look window. Don't need to do animations here |
192 | * This sends all the faces to the client, not just updates. This is |
329 | * This sends all the faces to the client, not just updates. This is |
193 | * because object ordering would otherwise be inconsistent. |
330 | * because object ordering would otherwise be inconsistent. |
194 | */ |
331 | */ |
195 | void |
332 | void |
196 | esrv_draw_look (object *pl) |
333 | esrv_draw_look (player *pl) |
197 | { |
334 | { |
198 | object *tmp, *last; |
|
|
199 | int got_one = 0, start_look = 0, end_look = 0; |
335 | int got_one = 0, start_look = 0, end_look = 0; |
200 | char buf[MAX_BUF]; |
|
|
201 | |
336 | |
|
|
337 | object *ob = pl->ob; |
|
|
338 | |
202 | if (!pl->contr->socket->update_look) |
339 | if (!pl->ns->update_look) |
203 | { |
340 | { |
204 | LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); |
341 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
205 | return; |
342 | return; |
206 | } |
343 | } |
207 | else |
344 | |
208 | pl->contr->socket->update_look = 0; |
345 | pl->ns->update_look = 0; |
209 | |
346 | |
210 | if (QUERY_FLAG (pl, FLAG_REMOVED) |
347 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
211 | || !pl->map |
348 | || !ob->map |
212 | || pl->map->in_memory != MAP_IN_MEMORY |
349 | || ob->map->in_memory != MAP_ACTIVE |
213 | || out_of_map (pl->map, pl->x, pl->y)) |
350 | || out_of_map (ob->map, ob->x, ob->y)) |
214 | return; |
351 | return; |
215 | |
352 | |
216 | for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) |
353 | pl->ns->send_packet ("delinv 0"); |
217 | ; |
|
|
218 | |
354 | |
219 | packet sl; |
355 | packet sl; |
220 | |
|
|
221 | pl->contr->socket->send_packet ("delinv 0"); |
|
|
222 | |
|
|
223 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
356 | sl.printf ("item%d ", pl->ns->itemcmd); |
224 | |
357 | |
225 | sl << uint32 (0); |
358 | sl << uint32 (0); |
226 | |
359 | |
227 | if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) |
360 | pl->ns->send_face (empty_face, -50); |
228 | esrv_send_face (pl->contr->socket, empty_face->number, 0); |
361 | pl->ns->flush_fx (); |
229 | |
362 | |
230 | if (pl->contr->socket->look_position) |
363 | if (pl->ns->look_position) |
231 | { |
364 | { |
232 | char buf[80]; |
365 | char buf[80]; |
233 | snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); |
366 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
234 | |
367 | |
235 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) |
368 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
236 | << uint32 (0) |
369 | << uint32 (0) |
237 | << sint32 (-1) |
370 | << sint32 (-1) |
238 | << uint32 (empty_face->number) |
371 | << uint32 (empty_face) |
239 | << data8 (buf) |
372 | << data8 (buf) |
240 | << uint16 (0) |
373 | << uint16 (0) |
241 | << uint8 (0) |
374 | << uint8 (0) |
242 | << uint32 (0); |
375 | << uint32 (0); |
243 | |
376 | |
244 | if (pl->contr->socket->itemcmd == 2) |
377 | if (pl->ns->itemcmd == 2) |
245 | sl << uint16 (0); |
378 | sl << uint16 (0); |
246 | } |
379 | } |
247 | |
380 | |
|
|
381 | object *tmp = ob->ms ().top; |
248 | for (last = NULL; tmp != last; tmp = tmp->below) |
382 | for (object *last = 0; tmp != last; tmp = tmp->below) |
249 | { |
383 | { |
250 | object *head; |
|
|
251 | |
|
|
252 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
384 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
253 | { |
385 | { |
254 | last = tmp->below; /* assumes double floor mode */ |
386 | last = tmp->below; /* assumes double floor mode */ |
255 | if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) |
387 | if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) |
256 | last = last->below; |
388 | last = last->below; |
257 | } |
389 | } |
258 | |
390 | |
259 | if (LOOK_OBJ (tmp)) |
391 | if (tmp->client_visible ()) |
260 | { |
392 | { |
261 | if (++start_look < pl->contr->socket->look_position) |
393 | if (++start_look < pl->ns->look_position) |
262 | continue; |
394 | continue; |
263 | |
395 | |
264 | end_look++; |
396 | end_look++; |
265 | |
397 | |
266 | if (end_look > NUM_LOOK_OBJECTS) |
398 | if (end_look > FLOORBOX_PAGESIZE) |
267 | { |
399 | { |
268 | /* What we basically do is make a 'fake' object - when the user applies it, |
400 | /* What we basically do is make a 'fake' object - when the user applies it, |
269 | * we notice the special tag the object has, and act accordingly. |
401 | * we notice the special tag the object has, and act accordingly. |
270 | */ |
402 | */ |
271 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) |
403 | sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) |
272 | << uint32 (0) |
404 | << uint32 (0) |
273 | << uint32 ((uint32) - 1) |
405 | << uint32 ((uint32) - 1) |
274 | << uint32 (empty_face->number) |
406 | << uint32 (empty_face) |
275 | << data8 ("Apply this to see next group of items") |
407 | << data8 ("Apply this to see next group of items") |
276 | << uint16 (0) |
408 | << uint16 (0) |
277 | << uint8 (0) |
409 | << uint8 (0) |
278 | << uint32 (0); |
410 | << uint32 (0); |
279 | |
411 | |
280 | if (pl->contr->socket->itemcmd == 2) |
412 | if (pl->ns->itemcmd == 2) |
281 | sl << uint16 (0); |
413 | sl << uint16 (0); |
282 | |
414 | |
283 | break; |
415 | break; |
284 | } |
416 | } |
285 | |
417 | |
286 | if (tmp->head) |
|
|
287 | head = tmp->head; |
|
|
288 | else |
|
|
289 | head = tmp; |
|
|
290 | |
|
|
291 | add_object_to_socklist (*pl->contr->socket, sl, head); |
418 | add_object_to_socklist (*pl->ns, sl, tmp->head_ ()); |
292 | got_one++; |
419 | got_one++; |
293 | |
420 | |
294 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
421 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
295 | { |
422 | { |
296 | pl->contr->socket->send_packet (sl); |
423 | pl->ns->send_packet (sl); |
297 | |
424 | |
298 | sl.reset (); |
425 | sl.reset (); |
299 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
426 | sl.printf ("item%d ", pl->ns->itemcmd); |
300 | sl << uint32 (0); |
427 | sl << uint32 (0); |
301 | got_one = 0; |
428 | got_one = 0; |
302 | } |
429 | } |
303 | } |
430 | } |
304 | } |
431 | } |
305 | |
432 | |
306 | if (got_one) |
433 | if (got_one) |
307 | pl->contr->socket->send_packet (sl); |
434 | pl->ns->send_packet (sl); |
308 | |
435 | |
309 | } |
436 | } |
310 | |
437 | |
311 | /** |
438 | /** |
312 | * Sends whole inventory. |
439 | * Sends whole inventory. |
313 | */ |
440 | */ |
314 | void |
441 | void |
315 | esrv_send_inventory (object *pl, object *op) |
442 | esrv_send_inventory (object *pl, object *op) |
316 | { |
443 | { |
317 | object *tmp; |
444 | if (!pl->contr->ns)//D |
|
|
445 | return; |
|
|
446 | |
318 | int got_one = 0; |
447 | int got_one = 0; |
319 | |
448 | |
|
|
449 | pl->contr->ns->send_packet_printf ("delinv %d", op->count); |
|
|
450 | |
320 | packet sl; |
451 | packet sl; |
321 | |
|
|
322 | sl.printf ("delinv %d", op->count); |
|
|
323 | pl->contr->socket->send_packet (sl); |
|
|
324 | |
|
|
325 | sl.reset (); |
|
|
326 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
452 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
327 | |
453 | |
328 | sl << uint32 (op->count); |
454 | sl << uint32 (op->count); |
329 | |
455 | |
330 | for (tmp = op->inv; tmp; tmp = tmp->below) |
456 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
331 | { |
457 | { |
332 | object *head; |
458 | object *head; |
333 | |
459 | |
334 | if (tmp->head) |
460 | if (tmp->head) |
335 | head = tmp->head; |
461 | head = tmp->head; |
336 | else |
462 | else |
337 | head = tmp; |
463 | head = tmp; |
338 | |
464 | |
339 | if (LOOK_OBJ (head)) |
465 | if (head->client_visible ()) |
340 | { |
466 | { |
341 | add_object_to_socklist (*pl->contr->socket, sl, head); |
467 | add_object_to_socklist (*pl->contr->ns, sl, head); |
342 | |
468 | |
343 | got_one++; |
469 | got_one++; |
344 | |
470 | |
345 | /* IT is possible for players to accumulate a huge amount of |
471 | /* IT is possible for players to accumulate a huge amount of |
346 | * items (especially with some of the bags out there) to |
472 | * items (especially with some of the bags out there) to |
347 | * overflow the buffer. IF so, send multiple item commands. |
473 | * overflow the buffer. IF so, send multiple item commands. |
348 | */ |
474 | */ |
349 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
475 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
350 | { |
476 | { |
351 | pl->contr->socket->send_packet (sl); |
477 | pl->contr->ns->send_packet (sl); |
352 | |
478 | |
353 | sl.reset (); |
479 | sl.reset (); |
354 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
480 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
355 | sl << uint32 (op->count); |
481 | sl << uint32 (op->count); |
356 | got_one = 0; |
482 | got_one = 0; |
357 | } |
483 | } |
358 | } /* If LOOK_OBJ() */ |
484 | } |
359 | } |
485 | } |
360 | |
486 | |
361 | if (got_one) |
487 | if (got_one) |
362 | pl->contr->socket->send_packet (sl); |
488 | pl->contr->ns->send_packet (sl); |
363 | } |
489 | } |
364 | |
490 | |
365 | /** |
491 | /** |
366 | * Updates object *op for player *pl. |
492 | * Updates object *op for player *pl. |
367 | * |
493 | * |
368 | * flags is a list of values to update |
494 | * flags is a list of values to update |
369 | * to the client (as defined in newclient.h - might as well use the |
495 | * to the client (as defined in newclient.h - might as well use the |
370 | * same value both places. |
496 | * same value both places. |
371 | */ |
497 | */ |
372 | |
|
|
373 | void |
498 | void |
374 | esrv_update_item (int flags, object *pl, object *op) |
499 | esrv_update_item (int flags, object *pl, object *op) |
375 | { |
500 | { |
376 | /* If we have a request to send the player item, skip a few checks. */ |
501 | /* If we have a request to send the player item, skip a few checks. */ |
377 | if (op != pl) |
502 | if (op != pl && !op->client_visible ()) |
378 | { |
|
|
379 | if (!LOOK_OBJ (op)) |
|
|
380 | return; |
503 | return; |
381 | /* we remove the check for op->env, because in theory, the object |
504 | |
382 | * is hopefully in the same place, so the client should preserve |
505 | client *ns = pl->contr->ns; |
383 | * order. |
506 | if (!ns) |
384 | */ |
507 | return; |
385 | } |
|
|
386 | |
508 | |
387 | if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) |
509 | if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) |
388 | { |
510 | { |
389 | /* FLAG_CLIENT_SENT is debug only. We are using it to see where |
511 | /* FLAG_CLIENT_SENT is debug only. We are using it to see where |
390 | * this is happening - we can set a breakpoint here in the debugger |
512 | * this is happening - we can set a breakpoint here in the debugger |
391 | * and track back the call. |
513 | * and track back the call. |
392 | */ |
514 | */ |
393 | LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); |
515 | LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); |
394 | } |
516 | } |
395 | |
517 | |
396 | packet sl; |
518 | packet sl ("upditem"); |
397 | |
519 | |
398 | sl << "upditem " |
|
|
399 | << uint8 (flags); |
520 | sl << uint8 (flags); |
400 | |
521 | |
401 | if (op->head) |
|
|
402 | op = op->head; |
522 | op = op->head_ (); |
403 | |
523 | |
404 | sl << uint32 (op->count); |
524 | sl << uint32 (op->count); |
405 | |
525 | |
406 | if (flags & UPD_LOCATION) |
526 | if (flags & UPD_LOCATION) |
407 | sl << uint32 (op->env ? op->env->count : 0); |
527 | sl << uint32 (op->env ? op->env->count : 0); |
… | |
… | |
409 | if (flags & UPD_FLAGS) |
529 | if (flags & UPD_FLAGS) |
410 | sl << uint32 (query_flags (op)); |
530 | sl << uint32 (query_flags (op)); |
411 | |
531 | |
412 | if (flags & UPD_WEIGHT) |
532 | if (flags & UPD_WEIGHT) |
413 | { |
533 | { |
414 | sint32 weight = WEIGHT (op); |
534 | sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); |
415 | |
535 | |
416 | sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); |
|
|
417 | |
|
|
418 | if (pl == op) |
536 | if (op) |
419 | op->contr->last_weight = weight; |
537 | ns->last_weight = weight; |
|
|
538 | |
|
|
539 | sl << uint32 (weight); |
420 | } |
540 | } |
421 | |
541 | |
422 | if (flags & UPD_FACE) |
542 | if (flags & UPD_FACE) |
423 | { |
543 | { |
424 | if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) |
544 | ns->send_face (op->face, -50); |
425 | esrv_send_face (pl->contr->socket, op->face->number, 0); |
545 | ns->flush_fx (); |
426 | |
|
|
427 | sl << uint32 (op->face->number); |
546 | sl << uint32 (op->face); |
428 | } |
547 | } |
429 | |
548 | |
430 | if (flags & UPD_NAME) |
549 | if (flags & UPD_NAME) |
431 | { |
550 | { |
432 | int len; |
551 | int len; |
… | |
… | |
466 | { |
585 | { |
467 | if (op->anim_speed) |
586 | if (op->anim_speed) |
468 | anim_speed = op->anim_speed; |
587 | anim_speed = op->anim_speed; |
469 | else |
588 | else |
470 | { |
589 | { |
471 | if (FABS (op->speed) < 0.001) |
590 | if (fabs (op->speed) < 0.001) |
472 | anim_speed = 255; |
591 | anim_speed = 255; |
473 | else if (FABS (op->speed) >= 1.0) |
592 | else if (fabs (op->speed) >= 1.0) |
474 | anim_speed = 1; |
593 | anim_speed = 1; |
475 | else |
594 | else |
476 | anim_speed = (int) (1.0 / FABS (op->speed)); |
595 | anim_speed = (int) (1.0 / fabs (op->speed)); |
477 | } |
596 | } |
478 | |
597 | |
479 | if (anim_speed > 255) |
598 | if (anim_speed > 255) |
480 | anim_speed = 255; |
599 | anim_speed = 255; |
481 | } |
600 | } |
… | |
… | |
484 | } |
603 | } |
485 | |
604 | |
486 | if (flags & UPD_NROF) |
605 | if (flags & UPD_NROF) |
487 | sl << uint32 (op->nrof); |
606 | sl << uint32 (op->nrof); |
488 | |
607 | |
489 | pl->contr->socket->send_packet (sl); |
608 | pl->contr->ns->send_packet (sl); |
490 | } |
609 | } |
491 | |
610 | |
492 | /** |
611 | /** |
493 | * Sends item's info to player. |
612 | * Sends item's info to player. |
494 | */ |
613 | */ |
495 | void |
614 | void |
496 | esrv_send_item (object *pl, object *op) |
615 | esrv_send_item (object *pl, object *op) |
497 | { |
616 | { |
498 | /* If this is not the player object, do some more checks */ |
617 | if (!pl->contr->ns) |
499 | if (op != pl) |
|
|
500 | { |
|
|
501 | /* We only send 'visibile' objects to the client */ |
|
|
502 | if (!LOOK_OBJ (op)) |
|
|
503 | return; |
618 | return; |
504 | /* if the item is on the ground, mark that the look needs to |
619 | |
505 | * be updated. |
620 | /* We only send 'visible' objects to the client, and sometimes the player */ |
506 | */ |
621 | if (!op->client_visible () && op->type != PLAYER) |
507 | if (!op->env) |
|
|
508 | { |
|
|
509 | pl->contr->socket->floorbox_update (); |
|
|
510 | return; |
622 | return; |
511 | } |
|
|
512 | } |
|
|
513 | |
623 | |
514 | packet sl; |
624 | packet sl; |
515 | |
625 | |
516 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
626 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
517 | |
627 | |
518 | if (op->head) |
|
|
519 | op = op->head; |
628 | op = op->head_ (); |
520 | |
629 | |
521 | sl << uint32 (op->env ? op->env->count : 0); |
630 | sl << uint32 (op->env ? op->env->count : 0); |
522 | |
631 | |
523 | add_object_to_socklist (*pl->contr->socket, sl, op); |
632 | add_object_to_socklist (*pl->contr->ns, sl, op); |
524 | |
633 | |
525 | pl->contr->socket->send_packet (sl); |
634 | pl->contr->ns->send_packet (sl); |
526 | SET_FLAG (op, FLAG_CLIENT_SENT); |
635 | SET_FLAG (op, FLAG_CLIENT_SENT); |
527 | } |
636 | } |
528 | |
637 | |
529 | /** |
638 | /** |
530 | * Tells the client to delete an item. Uses the item |
639 | * Tells the client to delete an item. |
531 | * command with a -1 location. |
|
|
532 | */ |
640 | */ |
533 | |
|
|
534 | void |
641 | void |
535 | esrv_del_item (player *pl, int tag) |
642 | esrv_del_item (player *pl, int tag) |
536 | { |
643 | { |
537 | packet sl; |
644 | if (!pl->ns) |
|
|
645 | return; |
538 | |
646 | |
539 | sl << "delitem " |
647 | packet sl ("delitem"); |
|
|
648 | |
540 | << uint32 (tag); |
649 | sl << uint32 (tag); |
541 | |
650 | |
542 | pl->socket->send_packet (sl); |
651 | pl->ns->send_packet (sl); |
543 | } |
652 | } |
544 | |
653 | |
545 | |
654 | |
546 | /******************************************************************************* |
655 | /******************************************************************************* |
547 | * |
656 | * |
… | |
… | |
551 | |
660 | |
552 | /** |
661 | /** |
553 | * Takes a player and object count (tag) and returns the actual object |
662 | * Takes a player and object count (tag) and returns the actual object |
554 | * pointer, or null if it can't be found. |
663 | * pointer, or null if it can't be found. |
555 | */ |
664 | */ |
556 | |
|
|
557 | object * |
665 | object * |
558 | esrv_get_ob_from_count (object *pl, tag_t count) |
666 | esrv_get_ob_from_count (object *pl, tag_t count) |
559 | { |
667 | { |
560 | object *op, *tmp; |
|
|
561 | |
|
|
562 | if (pl->count == count) |
668 | if (pl->count == count) |
563 | return pl; |
669 | return pl; |
564 | |
670 | |
565 | for (op = pl->inv; op; op = op->below) |
671 | for (object *op = pl->inv; op; op = op->below) |
566 | if (op->count == count) |
672 | if (op->count == count) |
567 | return op; |
673 | return op; |
568 | else if (op->type == CONTAINER && pl->container == op) |
674 | else if (op->type == CONTAINER && pl->container == op) |
569 | for (tmp = op->inv; tmp; tmp = tmp->below) |
675 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
570 | if (tmp->count == count) |
676 | if (tmp->count == count) |
571 | return tmp; |
677 | return tmp; |
572 | |
678 | |
573 | for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) |
679 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
574 | if (op->head && op->head->count == count) |
680 | if (op->head && op->head->count == count) |
575 | return op; |
681 | return op; |
576 | else if (op->count == count) |
682 | else if (op->count == count) |
577 | return op; |
683 | return op; |
578 | else if (op->type == CONTAINER && pl->container == op) |
684 | else if (op->type == CONTAINER && pl->container == op) |
579 | for (tmp = op->inv; tmp; tmp = tmp->below) |
685 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
580 | if (tmp->count == count) |
686 | if (tmp->count == count) |
581 | return tmp; |
687 | return tmp; |
582 | |
688 | |
|
|
689 | #if 0 |
|
|
690 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
691 | if (count & 0x80000000) |
|
|
692 | return 0; |
|
|
693 | #endif |
|
|
694 | |
583 | return 0; |
695 | return 0; |
584 | } |
696 | } |
585 | |
697 | |
586 | |
|
|
587 | /** Client wants to examine some object. So lets do so. */ |
698 | /** Client wants to examine some object. So lets do so. */ |
588 | void |
699 | void |
589 | ExamineCmd (char *buf, int len, player *pl) |
700 | ExamineCmd (char *buf, int len, player *pl) |
590 | { |
701 | { |
591 | tag_t tag = atoi (buf); |
702 | tag_t tag = atoi (buf); |
592 | |
|
|
593 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
594 | if (tag & 0x80000000) |
|
|
595 | return; |
|
|
596 | |
703 | |
597 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
704 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
598 | |
705 | |
599 | if (!op) |
706 | if (!op) |
600 | { |
707 | { |
601 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
708 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
602 | return; |
709 | return; |
603 | } |
710 | } |
604 | |
711 | |
605 | examine (pl->ob, op); |
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 | } |
606 | } |
730 | } |
607 | |
731 | |
608 | /** Client wants to apply some object. Lets do so. */ |
732 | /** Client wants to apply some object. Lets do so. */ |
609 | void |
733 | void |
610 | ApplyCmd (char *buf, int len, player *pl) |
734 | ApplyCmd (char *buf, int len, player *pl) |
… | |
… | |
618 | return; |
742 | return; |
619 | |
743 | |
620 | /* If the high bit is set, player applied a pseudo object. */ |
744 | /* If the high bit is set, player applied a pseudo object. */ |
621 | if (tag & 0x80000000) |
745 | if (tag & 0x80000000) |
622 | { |
746 | { |
623 | pl->socket->look_position = tag & 0x7fffffff; |
747 | pl->ns->look_position = tag & 0x7fffffff; |
624 | pl->socket->floorbox_update (); |
748 | pl->ns->floorbox_update (); |
625 | return; |
749 | return; |
626 | } |
750 | } |
627 | |
751 | |
628 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
752 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
629 | |
753 | |
… | |
… | |
634 | } |
758 | } |
635 | |
759 | |
636 | player_apply (pl->ob, op, 0, 0); |
760 | player_apply (pl->ob, op, 0, 0); |
637 | } |
761 | } |
638 | |
762 | |
639 | /** Client wants to apply some object. Lets do so. */ |
763 | /** Client wants to lock some object. Lets do so. */ |
640 | void |
764 | void |
641 | LockItem (char *data, int len, player *pl) |
765 | LockItem (char *data, int len, player *pl) |
642 | { |
766 | { |
643 | int flag = data[0]; |
767 | int flag = data[0]; |
644 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
768 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
645 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
769 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
646 | |
770 | |
647 | if (!op) |
771 | if (!op) |
648 | { |
772 | { |
649 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); |
773 | pl->failmsg ("Could not find object to lock/unlock"); |
650 | return; |
774 | return; |
651 | } |
775 | } |
652 | |
776 | |
653 | if (!flag) |
777 | if (!flag) |
654 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
778 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
… | |
… | |
656 | SET_FLAG (op, FLAG_INV_LOCKED); |
780 | SET_FLAG (op, FLAG_INV_LOCKED); |
657 | |
781 | |
658 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
782 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
659 | } |
783 | } |
660 | |
784 | |
661 | /** Client wants to apply some object. Lets do so. */ |
785 | /** Client wants to mark some object. Lets do so. */ |
662 | void |
786 | void |
663 | MarkItem (char *data, int len, player *pl) |
787 | MarkItem (char *data, int len, player *pl) |
664 | { |
788 | { |
665 | tag_t tag = net_uint32 ((uint8 *)data); |
789 | tag_t tag = net_uint32 ((uint8 *)data); |
666 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
790 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
667 | |
791 | |
668 | if (!op) |
792 | if (!op) |
669 | { |
793 | { |
670 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); |
794 | pl->failmsg ("Could not find object to mark"); |
671 | return; |
795 | return; |
672 | } |
796 | } |
673 | |
797 | |
674 | pl->mark = op; |
798 | pl->mark = op; |
675 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); |
799 | pl->ob->statusmsg (format ("Marked item %s", query_name (op))); |
676 | } |
800 | } |
677 | |
801 | |
678 | /** |
802 | /** |
679 | * look_at prints items on the specified square. |
803 | * look_at prints items on the specified square. |
680 | * |
804 | * |
681 | * [ removed EARTHWALL check and added check for containers inventory. |
805 | * [ removed EARTHWALL check and added check for containers inventory. |
682 | * Tero.Haatanen@lut.fi ] |
806 | * Tero.Haatanen@lut.fi ] |
683 | */ |
807 | */ |
684 | void |
808 | static void |
685 | look_at (object *op, int dx, int dy) |
809 | look_at (player *pl, int dx, int dy) |
686 | { |
810 | { |
687 | object *tmp; |
811 | dynbuf_text buf; |
688 | int flag = 0; |
812 | object *ob = pl->ob; |
689 | sint16 x, y; |
|
|
690 | maptile *m; |
|
|
691 | |
813 | |
692 | x = op->x + dx; |
814 | if (!pl->observe->map) |
693 | y = op->y + dy; |
|
|
694 | |
|
|
695 | if (out_of_map (op->map, x, y)) |
|
|
696 | return; |
815 | return; |
697 | |
816 | |
698 | m = get_map_from_coord (op->map, &x, &y); |
817 | mapxy pos (pl->observe); |
699 | if (!m) |
818 | pos.move (dx, dy); |
700 | return; |
|
|
701 | |
819 | |
702 | for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); |
820 | if (pos.normalise ()) |
703 | |
821 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
704 | for (; tmp != NULL; tmp = tmp->below) |
|
|
705 | { |
822 | { |
706 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
823 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
707 | continue; |
824 | continue; |
708 | |
825 | |
709 | if (!flag) |
|
|
710 | { |
|
|
711 | if (dx || dy) |
|
|
712 | new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); |
|
|
713 | else |
|
|
714 | { |
|
|
715 | clear_win_info (op); |
|
|
716 | new_draw_info (NDI_UNIQUE, 0, op, "You see:"); |
|
|
717 | } |
|
|
718 | flag = 1; |
|
|
719 | } |
|
|
720 | |
|
|
721 | if (QUERY_FLAG (op, FLAG_WIZ)) |
826 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
722 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); |
827 | buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); |
723 | else |
828 | else |
724 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); |
829 | buf.printf ("- %s.\n", query_name (tmp)); |
725 | |
830 | |
726 | if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && |
831 | object *head = tmp->head_ (); |
727 | (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) |
|
|
728 | inventory (op, tmp->head == NULL ? tmp : tmp->head); |
|
|
729 | |
832 | |
|
|
833 | if (head->inv) |
|
|
834 | if ((head->type != CONTAINER && head->type != FLESH) |
|
|
835 | || QUERY_FLAG (ob, FLAG_WIZ)) |
|
|
836 | buf << head->query_inventory (ob, " "); |
|
|
837 | |
730 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ |
838 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
731 | break; |
839 | break; |
732 | } |
840 | } |
733 | |
841 | |
734 | if (!flag) |
842 | if (buf.empty ()) |
735 | { |
843 | pl->failmsg ("You see nothing there."); |
736 | if (dx || dy) |
|
|
737 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); |
|
|
738 | else |
844 | else |
739 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); |
845 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
740 | } |
|
|
741 | } |
846 | } |
742 | |
|
|
743 | |
|
|
744 | |
847 | |
745 | /** Client wants to look at some object. Lets do so. */ |
848 | /** Client wants to look at some object. Lets do so. */ |
746 | void |
849 | void |
747 | LookAt (char *buf, int len, player *pl) |
850 | LookAt (char *buf, int len, player *pl) |
748 | { |
851 | { |
749 | int dx, dy; |
|
|
750 | char *cp; |
852 | char *cp; |
751 | |
853 | |
752 | dx = atoi (buf); |
854 | int dx = atoi (buf); |
753 | if (!(cp = strchr (buf, ' '))) |
855 | if (!(cp = strchr (buf, ' '))) |
754 | { |
|
|
755 | return; |
856 | return; |
756 | } |
857 | |
757 | dy = atoi (cp); |
858 | int dy = atoi (cp); |
758 | |
859 | |
759 | if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) |
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) |
760 | return; |
864 | return; |
761 | |
865 | |
762 | if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) |
866 | if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) |
763 | return; |
867 | return; |
|
|
868 | } |
764 | |
869 | |
765 | look_at (pl->ob, dx, dy); |
870 | look_at (pl, dx, dy); |
766 | } |
871 | } |
767 | |
872 | |
768 | /** Move an object to a new location */ |
873 | /** Move an object to a new location */ |
769 | void |
874 | void |
770 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
875 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
… | |
… | |
786 | /* If it is an active container, then we should drop all objects |
891 | /* If it is an active container, then we should drop all objects |
787 | * in the container and not the container itself. |
892 | * in the container and not the container itself. |
788 | */ |
893 | */ |
789 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
894 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
790 | { |
895 | { |
791 | object *current, *next; |
896 | int cnt = MAX_ITEM_PER_DROP; |
792 | |
897 | |
793 | for (current = op->inv; current != NULL; current = next) |
898 | for (object *current = op->inv; current; ) |
794 | { |
899 | { |
795 | next = current->below; |
900 | object *next = current->below; |
|
|
901 | |
796 | drop_object (pl, current, 0); |
902 | drop_object (pl, current, 0); |
|
|
903 | |
|
|
904 | if (--cnt <= 0) break; |
|
|
905 | |
|
|
906 | current = next; |
797 | } |
907 | } |
798 | |
908 | |
799 | esrv_update_item (UPD_WEIGHT, pl, op); |
909 | if (cnt <= 0) |
|
|
910 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
800 | } |
911 | } |
801 | else |
912 | else |
802 | drop_object (pl, op, nrof); |
913 | drop_object (pl, op, nrof); |
803 | |
914 | |
804 | return; |
915 | return; |
… | |
… | |
824 | /* put_object_in_sack presumes that necessary sanity checking |
935 | /* put_object_in_sack presumes that necessary sanity checking |
825 | * has already been done (eg, it can be picked up and fits in |
936 | * has already been done (eg, it can be picked up and fits in |
826 | * in a sack, so check for those things. We should also check |
937 | * in a sack, so check for those things. We should also check |
827 | * an make sure env is in fact a container for that matter. |
938 | * an make sure env is in fact a container for that matter. |
828 | */ |
939 | */ |
829 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
940 | if (env->type == CONTAINER |
|
|
941 | && can_pick (pl, op) |
|
|
942 | && sack_can_hold (pl, env, op, nrof)) |
830 | put_object_in_sack (pl, env, op, nrof); |
943 | put_object_in_sack (pl, env, op, nrof); |
831 | } |
944 | } |
832 | |
945 | |