ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.105 by root, Wed Nov 14 23:24:27 2018 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines