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

Diff Legend

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