… | |
… | |
30 | * This containes item logic for client/server. It doesn't contain |
30 | * This containes 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 | |
|
|
36 | #include <global.h> |
35 | #include <global.h> |
37 | #include <object.h> /* LOOK_OBJ */ |
36 | #include <object.h> /* LOOK_OBJ */ |
38 | #include <newclient.h> |
|
|
39 | #include <newserver.h> |
|
|
40 | #include <sproto.h> |
37 | #include <sproto.h> |
41 | |
38 | |
42 | /** 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 */ |
43 | #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 |
44 | |
181 | |
45 | /******************************************************************************* |
182 | /******************************************************************************* |
46 | * |
183 | * |
47 | * Functions related to sending object data to the client. |
184 | * Functions related to sending object data to the client. |
48 | * |
185 | * |
49 | ******************************************************************************/ |
186 | ******************************************************************************/ |
50 | |
187 | |
51 | /** |
188 | /** |
52 | * This is a similar to query_name, but returns flags |
189 | * This is a similar to query_name, but returns flags |
53 | * to be sended to client. |
190 | * to be sent to client. |
54 | */ |
191 | */ |
55 | unsigned int |
192 | unsigned int |
56 | query_flags (object *op) |
193 | query_flags (object *op) |
57 | { |
194 | { |
58 | unsigned int flags = 0; |
195 | unsigned int flags = 0; |
59 | |
196 | |
60 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
197 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
61 | { |
198 | { |
62 | switch (op->type) |
199 | switch (op->type) |
63 | { |
200 | { |
64 | case BOW: |
201 | case BOW: |
65 | case WAND: |
202 | case WAND: |
66 | case ROD: |
203 | case ROD: |
67 | case HORN: |
204 | case HORN: |
68 | flags = a_readied; |
205 | flags = a_readied; |
69 | break; |
206 | break; |
70 | case WEAPON: |
207 | case WEAPON: |
71 | flags = a_wielded; |
208 | flags = a_wielded; |
72 | break; |
209 | break; |
73 | case SKILL: |
210 | case SKILL: |
74 | case ARMOUR: |
211 | case ARMOUR: |
75 | case HELMET: |
212 | case HELMET: |
76 | case SHIELD: |
213 | case SHIELD: |
77 | case RING: |
214 | case RING: |
78 | case BOOTS: |
215 | case BOOTS: |
79 | case GLOVES: |
216 | case GLOVES: |
80 | case AMULET: |
217 | case AMULET: |
81 | case GIRDLE: |
218 | case GIRDLE: |
82 | case BRACERS: |
219 | case BRACERS: |
83 | case CLOAK: |
220 | case CLOAK: |
84 | flags = a_worn; |
221 | flags = a_worn; |
85 | break; |
222 | break; |
86 | case CONTAINER: |
223 | case CONTAINER: |
87 | flags = a_active; |
224 | flags = a_active; |
88 | break; |
225 | break; |
89 | default: |
226 | default: |
90 | flags = a_applied; |
227 | flags = a_applied; |
91 | break; |
228 | break; |
92 | } |
229 | } |
93 | } |
230 | } |
|
|
231 | |
94 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
232 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
95 | flags |= F_OPEN; |
233 | flags |= F_OPEN; |
96 | |
234 | |
97 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
235 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
98 | { |
236 | { |
99 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
237 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
100 | flags |= F_DAMNED; |
238 | flags |= F_DAMNED; |
101 | else if (QUERY_FLAG (op, FLAG_CURSED)) |
239 | else if (QUERY_FLAG (op, FLAG_CURSED)) |
102 | flags |= F_CURSED; |
240 | flags |= F_CURSED; |
103 | } |
241 | } |
|
|
242 | |
104 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
243 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
105 | flags |= F_MAGIC; |
244 | flags |= F_MAGIC; |
106 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
245 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
107 | flags |= F_UNPAID; |
246 | flags |= F_UNPAID; |
108 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
247 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
… | |
… | |
114 | /* Used in the send_look to put object head into packet |
253 | /* Used in the send_look to put object head into packet |
115 | * sl for socket ns. Need socket to know if we need to send |
254 | * sl for socket ns. Need socket to know if we need to send |
116 | * animation of face to the client. |
255 | * animation of face to the client. |
117 | */ |
256 | */ |
118 | static void |
257 | static void |
119 | add_object_to_socklist (client_socket &ns, packet &sl, object *head) |
258 | add_object_to_socklist (client &ns, packet &sl, object *head) |
120 | { |
259 | { |
121 | int flags, len, anim_speed; |
260 | int flags, len, anim_speed; |
122 | char item_n[MAX_BUF]; |
261 | char item_n[MAX_BUF]; |
123 | const char *item_p; |
262 | const char *item_p; |
124 | |
263 | |
… | |
… | |
187 | SET_FLAG (head, FLAG_CLIENT_SENT); |
326 | SET_FLAG (head, FLAG_CLIENT_SENT); |
188 | } |
327 | } |
189 | |
328 | |
190 | |
329 | |
191 | /** |
330 | /** |
192 | * Send the look window. Don't need to do animations here |
331 | * Send the look window. Don't need to do animations here |
193 | * This sends all the faces to the client, not just updates. This is |
332 | * This sends all the faces to the client, not just updates. This is |
194 | * because object ordering would otherwise be inconsistent |
333 | * because object ordering would otherwise be inconsistent. |
195 | */ |
334 | */ |
196 | |
|
|
197 | void |
335 | void |
198 | esrv_draw_look (object *pl) |
336 | esrv_draw_look (object *pl) |
199 | { |
337 | { |
200 | object *tmp, *last; |
338 | object *tmp, *last; |
201 | int got_one = 0, start_look = 0, end_look = 0; |
339 | int got_one = 0, start_look = 0, end_look = 0; |
… | |
… | |
213 | || !pl->map |
351 | || !pl->map |
214 | || pl->map->in_memory != MAP_IN_MEMORY |
352 | || pl->map->in_memory != MAP_IN_MEMORY |
215 | || out_of_map (pl->map, pl->x, pl->y)) |
353 | || out_of_map (pl->map, pl->x, pl->y)) |
216 | return; |
354 | return; |
217 | |
355 | |
218 | for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) |
356 | for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) |
219 | ; |
357 | ; |
220 | |
358 | |
|
|
359 | pl->contr->socket->send_packet ("delinv 0"); |
|
|
360 | |
221 | packet sl; |
361 | packet sl; |
222 | |
|
|
223 | pl->contr->socket->send_packet ("delinv 0"); |
|
|
224 | |
|
|
225 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
362 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
226 | |
363 | |
227 | sl << uint32 (0); |
364 | sl << uint32 (0); |
228 | |
365 | |
229 | if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) |
366 | if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) |
230 | esrv_send_face (pl->contr->socket, empty_face->number, 0); |
367 | esrv_send_face (pl->contr->socket, empty_face->number, 0); |
231 | |
368 | |
232 | if (pl->contr->socket->look_position) |
369 | if (pl->contr->socket->look_position) |
233 | { |
370 | { |
|
|
371 | char buf[80]; |
|
|
372 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
|
|
373 | |
234 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) |
374 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) |
235 | << uint32 (0) |
375 | << uint32 (0) |
236 | << sint32 (-1) |
376 | << sint32 (-1) |
237 | << uint32 (empty_face->number); |
377 | << uint32 (empty_face->number) |
238 | |
378 | << data8 (buf) |
239 | sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS); |
|
|
240 | |
|
|
241 | sl << uint16 (0) |
379 | << uint16 (0) |
242 | << uint8 (0) |
380 | << uint8 (0) |
243 | << uint32 (0); |
381 | << uint32 (0); |
244 | |
382 | |
245 | if (pl->contr->socket->itemcmd == 2) |
383 | if (pl->contr->socket->itemcmd == 2) |
246 | sl << uint16 (0); |
384 | sl << uint16 (0); |
… | |
… | |
262 | if (++start_look < pl->contr->socket->look_position) |
400 | if (++start_look < pl->contr->socket->look_position) |
263 | continue; |
401 | continue; |
264 | |
402 | |
265 | end_look++; |
403 | end_look++; |
266 | |
404 | |
267 | if (end_look > NUM_LOOK_OBJECTS) |
405 | if (end_look > FLOORBOX_PAGESIZE) |
268 | { |
406 | { |
269 | /* What we basically do is make a 'fake' object - when the user applies it, |
407 | /* What we basically do is make a 'fake' object - when the user applies it, |
270 | * we notice the special tag the object has, and act accordingly. |
408 | * we notice the special tag the object has, and act accordingly. |
271 | */ |
409 | */ |
272 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) |
410 | sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) |
273 | << uint32 (0) |
411 | << uint32 (0) |
274 | << uint32 ((uint32) - 1) |
412 | << uint32 ((uint32) - 1) |
275 | << uint32 (empty_face->number); |
413 | << uint32 (empty_face->number) |
276 | |
414 | << data8 ("Apply this to see next group of items") |
277 | sl.printf ("Click here to see next group of items"); |
|
|
278 | |
|
|
279 | sl << uint16 (0) |
415 | << uint16 (0) |
280 | << uint8 (0) |
416 | << uint8 (0) |
281 | << uint32 (0); |
417 | << uint32 (0); |
282 | |
418 | |
283 | if (pl->contr->socket->itemcmd == 2) |
419 | if (pl->contr->socket->itemcmd == 2) |
284 | sl << uint16 (0); |
420 | sl << uint16 (0); |
… | |
… | |
301 | sl.reset (); |
437 | sl.reset (); |
302 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
438 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
303 | sl << uint32 (0); |
439 | sl << uint32 (0); |
304 | got_one = 0; |
440 | got_one = 0; |
305 | } |
441 | } |
306 | } /* If LOOK_OBJ() */ |
442 | } |
307 | } |
443 | } |
308 | |
444 | |
309 | if (got_one) |
445 | if (got_one) |
310 | pl->contr->socket->send_packet (sl); |
446 | pl->contr->socket->send_packet (sl); |
311 | |
447 | |
… | |
… | |
318 | esrv_send_inventory (object *pl, object *op) |
454 | esrv_send_inventory (object *pl, object *op) |
319 | { |
455 | { |
320 | object *tmp; |
456 | object *tmp; |
321 | int got_one = 0; |
457 | int got_one = 0; |
322 | |
458 | |
|
|
459 | |
|
|
460 | pl->contr->socket->send_packet_printf ("delinv %d", op->count); |
|
|
461 | |
323 | packet sl; |
462 | packet sl; |
324 | |
|
|
325 | sl.printf ("delinv %d", op->count); |
|
|
326 | pl->contr->socket->send_packet (sl); |
|
|
327 | |
|
|
328 | sl.reset (); |
|
|
329 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
463 | sl.printf ("item%d ", pl->contr->socket->itemcmd); |
330 | |
464 | |
331 | sl << uint32 (op->count); |
465 | sl << uint32 (op->count); |
332 | |
466 | |
333 | for (tmp = op->inv; tmp; tmp = tmp->below) |
467 | for (tmp = op->inv; tmp; tmp = tmp->below) |
… | |
… | |
361 | } /* If LOOK_OBJ() */ |
495 | } /* If LOOK_OBJ() */ |
362 | } |
496 | } |
363 | |
497 | |
364 | if (got_one) |
498 | if (got_one) |
365 | pl->contr->socket->send_packet (sl); |
499 | pl->contr->socket->send_packet (sl); |
366 | |
|
|
367 | } |
500 | } |
368 | |
501 | |
369 | /** |
502 | /** |
370 | * Updates object *op for player *pl. |
503 | * Updates object *op for player *pl. |
371 | * |
504 | * |
… | |
… | |
395 | * and track back the call. |
528 | * and track back the call. |
396 | */ |
529 | */ |
397 | LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); |
530 | LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); |
398 | } |
531 | } |
399 | |
532 | |
400 | packet sl; |
533 | packet sl ("upditem"); |
401 | |
534 | |
402 | sl << "upditem " |
|
|
403 | << uint8 (flags); |
535 | sl << uint8 (flags); |
404 | |
536 | |
405 | if (op->head) |
537 | if (op->head) |
406 | op = op->head; |
538 | op = op->head; |
407 | |
539 | |
408 | sl << uint32 (op->count); |
540 | sl << uint32 (op->count); |
… | |
… | |
508 | /* if the item is on the ground, mark that the look needs to |
640 | /* if the item is on the ground, mark that the look needs to |
509 | * be updated. |
641 | * be updated. |
510 | */ |
642 | */ |
511 | if (!op->env) |
643 | if (!op->env) |
512 | { |
644 | { |
513 | pl->contr->socket->update_look = 1; |
645 | pl->contr->socket->floorbox_update (); |
514 | return; |
646 | return; |
515 | } |
647 | } |
516 | } |
648 | } |
517 | |
649 | |
518 | packet sl; |
650 | packet sl; |
… | |
… | |
526 | |
658 | |
527 | add_object_to_socklist (*pl->contr->socket, sl, op); |
659 | add_object_to_socklist (*pl->contr->socket, sl, op); |
528 | |
660 | |
529 | pl->contr->socket->send_packet (sl); |
661 | pl->contr->socket->send_packet (sl); |
530 | SET_FLAG (op, FLAG_CLIENT_SENT); |
662 | SET_FLAG (op, FLAG_CLIENT_SENT); |
531 | |
|
|
532 | } |
663 | } |
533 | |
664 | |
534 | /** |
665 | /** |
535 | * Tells the client to delete an item. Uses the item |
666 | * Tells the client to delete an item. Uses the item |
536 | * command with a -1 location. |
667 | * command with a -1 location. |
537 | */ |
668 | */ |
538 | |
669 | |
539 | void |
670 | void |
540 | esrv_del_item (player *pl, int tag) |
671 | esrv_del_item (player *pl, int tag) |
541 | { |
672 | { |
542 | packet sl; |
673 | packet sl ("delitem"); |
543 | |
674 | |
544 | sl << "delitem " |
|
|
545 | << uint32 (tag); |
675 | sl << uint32 (tag); |
546 | |
676 | |
547 | pl->socket->send_packet (sl); |
677 | pl->socket->send_packet (sl); |
548 | } |
678 | } |
549 | |
679 | |
550 | |
680 | |
… | |
… | |
573 | else if (op->type == CONTAINER && pl->container == op) |
703 | else if (op->type == CONTAINER && pl->container == op) |
574 | for (tmp = op->inv; tmp; tmp = tmp->below) |
704 | for (tmp = op->inv; tmp; tmp = tmp->below) |
575 | if (tmp->count == count) |
705 | if (tmp->count == count) |
576 | return tmp; |
706 | return tmp; |
577 | |
707 | |
578 | for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) |
708 | for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
579 | if (op->head != NULL && op->head->count == count) |
709 | if (op->head && op->head->count == count) |
580 | return op; |
710 | return op; |
581 | else if (op->count == count) |
711 | else if (op->count == count) |
582 | return op; |
712 | return op; |
583 | else if (op->type == CONTAINER && pl->container == op) |
713 | else if (op->type == CONTAINER && pl->container == op) |
584 | for (tmp = op->inv; tmp; tmp = tmp->below) |
714 | for (tmp = op->inv; tmp; tmp = tmp->below) |
585 | if (tmp->count == count) |
715 | if (tmp->count == count) |
586 | return tmp; |
716 | return tmp; |
587 | |
717 | |
588 | return NULL; |
718 | return 0; |
589 | } |
719 | } |
590 | |
720 | |
591 | |
721 | |
592 | /** Client wants to examine some object. So lets do so. */ |
722 | /** Client wants to examine some object. So lets do so. */ |
593 | void |
723 | void |
… | |
… | |
608 | } |
738 | } |
609 | |
739 | |
610 | examine (pl->ob, op); |
740 | examine (pl->ob, op); |
611 | } |
741 | } |
612 | |
742 | |
613 | /** Client wants to apply some object. Lets do so. */ |
743 | /** Client wants to apply some object. Lets do so. */ |
614 | void |
744 | void |
615 | ApplyCmd (char *buf, int len, player *pl) |
745 | ApplyCmd (char *buf, int len, player *pl) |
616 | { |
746 | { |
617 | tag_t tag = atoi (buf); |
747 | tag_t tag = atoi (buf); |
618 | |
748 | |
… | |
… | |
624 | |
754 | |
625 | /* If the high bit is set, player applied a pseudo object. */ |
755 | /* If the high bit is set, player applied a pseudo object. */ |
626 | if (tag & 0x80000000) |
756 | if (tag & 0x80000000) |
627 | { |
757 | { |
628 | pl->socket->look_position = tag & 0x7fffffff; |
758 | pl->socket->look_position = tag & 0x7fffffff; |
629 | pl->socket->update_look = 1; |
759 | pl->socket->floorbox_update (); |
630 | return; |
760 | return; |
631 | } |
761 | } |
632 | |
762 | |
633 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
763 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
634 | |
764 | |
… | |
… | |
639 | } |
769 | } |
640 | |
770 | |
641 | player_apply (pl->ob, op, 0, 0); |
771 | player_apply (pl->ob, op, 0, 0); |
642 | } |
772 | } |
643 | |
773 | |
644 | /** Client wants to apply some object. Lets do so. */ |
774 | /** Client wants to lock some object. Lets do so. */ |
645 | void |
775 | void |
646 | LockItem (uint8 *data, int len, player *pl) |
776 | LockItem (char *data, int len, player *pl) |
647 | { |
777 | { |
648 | int flag = data[0]; |
778 | int flag = data[0]; |
649 | tag_t tag = net_uint32 (data + 1); |
779 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
650 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
780 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
651 | |
781 | |
652 | if (!op) |
782 | if (!op) |
653 | { |
783 | { |
654 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); |
784 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); |
… | |
… | |
661 | SET_FLAG (op, FLAG_INV_LOCKED); |
791 | SET_FLAG (op, FLAG_INV_LOCKED); |
662 | |
792 | |
663 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
793 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
664 | } |
794 | } |
665 | |
795 | |
666 | /** Client wants to apply some object. Lets do so. */ |
796 | /** Client wants to mark some object. Lets do so. */ |
667 | void |
797 | void |
668 | MarkItem (uint8 * data, int len, player *pl) |
798 | MarkItem (char *data, int len, player *pl) |
669 | { |
799 | { |
670 | tag_t tag = net_uint32 (data); |
800 | tag_t tag = net_uint32 ((uint8 *)data); |
671 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
801 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
672 | |
802 | |
673 | if (!op) |
803 | if (!op) |
674 | { |
804 | { |
675 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); |
805 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); |
… | |
… | |
702 | |
832 | |
703 | m = get_map_from_coord (op->map, &x, &y); |
833 | m = get_map_from_coord (op->map, &x, &y); |
704 | if (!m) |
834 | if (!m) |
705 | return; |
835 | return; |
706 | |
836 | |
707 | for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); |
837 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); |
708 | |
838 | |
709 | for (; tmp != NULL; tmp = tmp->below) |
839 | for (; tmp != NULL; tmp = tmp->below) |
710 | { |
840 | { |
711 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
841 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
712 | continue; |
842 | continue; |
… | |
… | |
802 | } |
932 | } |
803 | |
933 | |
804 | esrv_update_item (UPD_WEIGHT, pl, op); |
934 | esrv_update_item (UPD_WEIGHT, pl, op); |
805 | } |
935 | } |
806 | else |
936 | else |
807 | { |
|
|
808 | drop_object (pl, op, nrof); |
937 | drop_object (pl, op, nrof); |
809 | } |
938 | |
810 | return; |
939 | return; |
811 | } |
940 | } |
812 | else if (to == pl->count) |
941 | else if (to == pl->count) |
813 | { /* pick it up to the inventory */ |
942 | { /* pick it up to the inventory */ |
814 | /* return if player has already picked it up */ |
943 | /* return if player has already picked it up */ |
… | |
… | |
831 | * has already been done (eg, it can be picked up and fits in |
960 | * has already been done (eg, it can be picked up and fits in |
832 | * in a sack, so check for those things. We should also check |
961 | * in a sack, so check for those things. We should also check |
833 | * an make sure env is in fact a container for that matter. |
962 | * an make sure env is in fact a container for that matter. |
834 | */ |
963 | */ |
835 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
964 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
836 | { |
|
|
837 | put_object_in_sack (pl, env, op, nrof); |
965 | put_object_in_sack (pl, env, op, nrof); |
838 | } |
|
|
839 | } |
966 | } |
840 | |
967 | |