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

Diff Legend

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