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.14 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.93 by root, Sun Apr 11 23:32:10 2010 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 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 pl->ns->send_packet ("delinv 0");
222 199
223 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); 200 if (pl->run_on)
201 return;
224 202
203 pl->ns->update_look = 0;
204
205 if (ob->flag [FLAG_REMOVED]
206 || !ob->map
207 || ob->map->in_memory != MAP_ACTIVE
208 || out_of_map (ob->map, ob->x, ob->y))
209 return;
210
211 packet sl;
225 sl.printf ("item%d ", pl->contr->socket.itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
226 213
227 sl << uint32 (0); 214 sl << uint32 (0);
228 215
229 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 216 int start_pos = pl->ns->look_position;
230 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 217 bool dirty = false;
231 218
232 if (pl->contr->socket.look_position) 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])
244 {
245 // we are finished, don't append "next group of items"
246 // by setting item to ms.bot it becomes zero which is checked after the while loop
247 item = ms.bot;
248 }
233 { 249 }
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 250
251 // see if there are more if we cared - we ignore invisible objects
252 if (item)
253 {
254 /* What we basically do is make a 'fake' object - when the user applies it,
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);
265
266 if (pl->ns->itemcmd == 2)
267 sl << uint16 (0);
268
269 dirty = true;
270 }
271
272 // now send out all items in the ring buffer in reverse order
273 while (item_cnt)
274 {
275 --item_cnt;
276 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
277 object *item = items [item_idx];
278
279 add_object_to_socklist (*pl->ns, sl, item->head_ ());
280
281 dirty = true;
282
283 // if packet got too large, send it and begin a new one
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
285 {
286 pl->ns->flush_fx ();
287 pl->ns->send_packet (sl);
288
289 sl.reset ();
290 sl.printf ("item%d ", pl->ns->itemcmd);
291 sl << uint32 (0);
292
293 dirty = false;
294 }
295 }
296
297 if (start_pos)
298 {
299 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
235 << uint32 (0) 300 << uint32 (0)
236 << sint32 (-1) 301 << sint32 (-1)
237 << uint32 (empty_face->number); 302 << uint32 (need_face_now (pl, FINGER_UP))
238 303 << 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) 304 << uint16 (0)
242 << uint8 (0) 305 << uint8 (0)
243 << uint32 (0); 306 << uint32 (0);
244 307
245 if (pl->contr->socket.itemcmd == 2) 308 if (pl->ns->itemcmd == 2)
246 sl << uint16 (0); 309 sl << uint16 (0);
247 }
248 310
249 for (last = NULL; tmp != last; tmp = tmp->below) 311 dirty = true;
250 { 312 }
251 object *head;
252 313
253 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 314 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 } 315 {
308 316 pl->ns->flush_fx ();
309 if (got_one) 317 pl->ns->send_packet (sl);
310 Send_With_Handling (&pl->contr->socket, &sl); 318 }
311
312 sl.free ();
313} 319}
314 320
315/** 321/**
316 * Sends whole inventory. 322 * Sends whole inventory.
317 */ 323 */
318void 324void
319esrv_send_inventory (object *pl, object *op) 325esrv_send_inventory (object *pl, object *op)
320{ 326{
321 object *tmp; 327 if (!pl->contr->ns)//D
328 return;
329
322 int got_one = 0; 330 int got_one = 0;
323 331
324 SockList sl (MAXSOCKBUF); 332 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
325 333
326 sl.printf ("delinv %d", op->count); 334 packet sl;
327 Send_With_Handling (&pl->contr->socket, &sl);
328
329 sl.reset ();
330 sl.printf ("item%d ", pl->contr->socket.itemcmd); 335 sl.printf ("item%d ", pl->contr->ns->itemcmd);
331 336
332 sl << uint32 (op->count); 337 sl << uint32 (op->count);
333 338
334 for (tmp = op->inv; tmp; tmp = tmp->below) 339 for (object *tmp = op->inv; tmp; tmp = tmp->below)
335 { 340 {
336 object *head; 341 object *head;
337 342
338 if (tmp->head) 343 if (tmp->head)
339 head = tmp->head; 344 head = tmp->head;
340 else 345 else
341 head = tmp; 346 head = tmp;
342 347
343 if (LOOK_OBJ (head)) 348 if (head->client_visible ())
344 { 349 {
345 add_object_to_socklist (pl->contr->socket, sl, head); 350 add_object_to_socklist (*pl->contr->ns, sl, head);
346 351
347 got_one++; 352 got_one++;
348 353
349 /* IT is possible for players to accumulate a huge amount of 354 /* IT is possible for players to accumulate a huge amount of
350 * items (especially with some of the bags out there) to 355 * items (especially with some of the bags out there) to
351 * overflow the buffer. IF so, send multiple item commands. 356 * overflow the buffer. IF so, send multiple item commands.
352 */ 357 */
353 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 358 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
354 { 359 {
355 Send_With_Handling (&pl->contr->socket, &sl); 360 pl->contr->ns->flush_fx ();
361 pl->contr->ns->send_packet (sl);
362
363 sl.reset ();
356 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 364 sl.printf ("item%d ", pl->contr->ns->itemcmd);
357 sl.len = strlen ((char *) sl.buf);
358 sl << uint32 (op->count); 365 sl << uint32 (op->count);
359 got_one = 0; 366 got_one = 0;
360 } 367 }
361 } /* If LOOK_OBJ() */ 368 }
362 } 369 }
363 370
364 if (got_one) 371 if (got_one)
365 Send_With_Handling (&pl->contr->socket, &sl); 372 {
366 373 pl->contr->ns->flush_fx ();
367 sl.free (); 374 pl->contr->ns->send_packet (sl);
375 }
368} 376}
369 377
370/** 378/**
371 * Updates object *op for player *pl. 379 * Updates object *op for player *pl.
372 * 380 *
373 * flags is a list of values to update 381 * flags is a list of values to update
374 * to the client (as defined in newclient.h - might as well use the 382 * to the client (as defined in newclient.h - might as well use the
375 * same value both places. 383 * same value both places.
376 */ 384 */
377
378void 385void
379esrv_update_item (int flags, object *pl, object *op) 386esrv_update_item (int flags, object *pl, object *op)
380{ 387{
381 /* If we have a request to send the player item, skip a few checks. */ 388 /* If we have a request to send the player item, skip a few checks. */
382 if (op != pl) 389 if (op != pl && !op->client_visible ())
383 {
384 if (!LOOK_OBJ (op))
385 return; 390 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 391
392 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 392 client *ns = pl->contr->ns;
393 { 393 if (!ns)
394 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 394 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 395
401 SockList sl (MAXSOCKBUF); 396 packet sl ("upditem");
402 397
403 sl << "upditem "
404 << uint8 (flags); 398 sl << uint8 (flags);
405 399
406 if (op->head)
407 op = op->head; 400 op = op->head_ ();
408 401
409 sl << uint32 (op->count); 402 sl << uint32 (op->count);
410 403
411 if (flags & UPD_LOCATION) 404 if (flags & UPD_LOCATION)
412 sl << uint32 (op->env ? op->env->count : 0); 405 sl << uint32 (op->env ? op->env->count : 0);
… …
414 if (flags & UPD_FLAGS) 407 if (flags & UPD_FLAGS)
415 sl << uint32 (query_flags (op)); 408 sl << uint32 (query_flags (op));
416 409
417 if (flags & UPD_WEIGHT) 410 if (flags & UPD_WEIGHT)
418 { 411 {
419 sint32 weight = WEIGHT (op); 412 sint32 weight = op->client_weight ();
420 413
421 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 414 if (op == pl)
422
423 if (pl == op)
424 op->contr->last_weight = weight; 415 ns->last_weight = weight;
416
417 sl << uint32 (weight);
425 } 418 }
426 419
427 if (flags & UPD_FACE) 420 if (flags & UPD_FACE)
428 { 421 {
429 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 422 ns->send_face (op->face, -50);
430 esrv_send_face (&pl->contr->socket, op->face->number, 0); 423 ns->flush_fx ();
431
432 sl << uint32 (op->face->number); 424 sl << uint32 (op->face);
433 } 425 }
434 426
435 if (flags & UPD_NAME) 427 if (flags & UPD_NAME)
436 { 428 {
437 int len; 429 int len;
438 const char *item_p; 430 const char *item_p;
439 char item_n[MAX_BUF]; 431 char item_n[127 * 2];
440 432
441 if (!op->custom_name) 433 if (!op->custom_name)
442 { 434 {
443 strncpy (item_n, query_base_name (op, 0), 127); 435 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); 436 item_p = query_base_name (op, 1);
447 } 437 }
448 else 438 else
449 { 439 {
450 strncpy (item_n, op->custom_name, 127); 440 len = assign (item_n, &op->custom_name, 127);
451 item_n[127] = 0;
452 len = strlen (item_n);
453 item_p = op->custom_name; 441 item_p = &op->custom_name;
454 } 442 }
455 443
456 strncpy (item_n + len + 1, item_p, 127); 444 len += assign (item_n + len, item_p, 127);
457 item_n[254] = 0;
458 len += strlen (item_n + 1 + len) + 1;
459 445
460 sl << data8 (item_n, len); 446 sl << data8 (item_n, len);
461 } 447 }
462 448
463 if (flags & UPD_ANIM) 449 if (flags & UPD_ANIM)
… …
465 451
466 if (flags & UPD_ANIMSPEED) 452 if (flags & UPD_ANIMSPEED)
467 { 453 {
468 int anim_speed = 0; 454 int anim_speed = 0;
469 455
470 if (QUERY_FLAG (op, FLAG_ANIMATE)) 456 if (op->flag [FLAG_ANIMATE])
471 { 457 {
472 if (op->anim_speed) 458 if (op->anim_speed)
473 anim_speed = op->anim_speed; 459 anim_speed = op->anim_speed;
474 else 460 else
475 { 461 {
476 if (FABS (op->speed) < 0.001) 462 if (op->speed < 0.001)
477 anim_speed = 255; 463 anim_speed = 255;
478 else if (FABS (op->speed) >= 1.0) 464 else if (op->speed >= 1.0)
479 anim_speed = 1; 465 anim_speed = 1;
480 else 466 else
481 anim_speed = (int) (1.0 / FABS (op->speed)); 467 anim_speed = 1. / op->speed;
482 } 468 }
483 469
484 if (anim_speed > 255) 470 if (anim_speed > 255)
485 anim_speed = 255; 471 anim_speed = 255;
486 } 472 }
… …
489 } 475 }
490 476
491 if (flags & UPD_NROF) 477 if (flags & UPD_NROF)
492 sl << uint32 (op->nrof); 478 sl << uint32 (op->nrof);
493 479
494 Send_With_Handling (&pl->contr->socket, &sl); 480 pl->contr->ns->send_packet (sl);
495 sl.free ();
496} 481}
497 482
498/** 483/**
499 * Sends item's info to player. 484 * Sends item's info to player.
500 */ 485 */
501void 486void
502esrv_send_item (object *pl, object *op) 487esrv_send_item (object *pl, object *op)
503{ 488{
504 /* If this is not the player object, do some more checks */ 489 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; 490 return;
510 /* if the item is on the ground, mark that the look needs to 491
511 * be updated. 492 /* We only send 'visible' objects to the client, and sometimes the player */
512 */ 493 if (!op->client_visible () && op->type != PLAYER)
513 if (!op->env)
514 {
515 pl->contr->socket.update_look = 1;
516 return; 494 return;
517 }
518 }
519 495
520 SockList sl (MAXSOCKBUF); 496 packet sl;
521 497
522 sl.printf ("item%d ", pl->contr->socket.itemcmd); 498 sl.printf ("item%d ", pl->contr->ns->itemcmd);
523 499
524 if (op->head)
525 op = op->head; 500 op = op->head_ ();
526 501
527 sl << uint32 (op->env ? op->env->count : 0); 502 sl << uint32 (op->env ? op->env->count : 0);
528 503
529 add_object_to_socklist (pl->contr->socket, sl, op); 504 add_object_to_socklist (*pl->contr->ns, sl, op);
530 505
531 Send_With_Handling (&pl->contr->socket, &sl); 506 pl->contr->ns->flush_fx ();
532 SET_FLAG (op, FLAG_CLIENT_SENT); 507 pl->contr->ns->send_packet (sl);
533
534 sl.free ();
535} 508}
536 509
537/** 510/**
538 * Tells the client to delete an item. Uses the item 511 * Tells the client to delete an item.
539 * command with a -1 location.
540 */ 512 */
541
542void 513void
543esrv_del_item (player *pl, int tag) 514esrv_del_item (player *pl, int tag)
544{ 515{
545 SockList sl (MAXSOCKBUF); 516 if (!pl->ns)
517 return;
546 518
547 sl << "delitem " 519 packet sl ("delitem");
520
548 << uint32 (tag); 521 sl << uint32 (tag);
549 522
550 Send_With_Handling (&pl->socket, &sl); 523 pl->ns->send_packet (sl);
551 sl.free ();
552} 524}
553 525
554 526
555/******************************************************************************* 527/*******************************************************************************
556 * 528 *
… …
560 532
561/** 533/**
562 * Takes a player and object count (tag) and returns the actual object 534 * Takes a player and object count (tag) and returns the actual object
563 * pointer, or null if it can't be found. 535 * pointer, or null if it can't be found.
564 */ 536 */
565 537static object *
566object *
567esrv_get_ob_from_count (object *pl, tag_t count) 538esrv_get_ob_from_count (object *pl, tag_t count)
568{ 539{
569 object *op, *tmp;
570
571 if (pl->count == count) 540 if (pl->count == count)
572 return pl; 541 return pl;
573 542
574 for (op = pl->inv; op; op = op->below) 543 for (object *op = pl->inv; op; op = op->below)
575 if (op->count == count) 544 if (op->count == count)
576 return op; 545 return op;
577 else if (op->type == CONTAINER && pl->container == op) 546 else if (op->type == CONTAINER && pl->container_ () == op)
578 for (tmp = op->inv; tmp; tmp = tmp->below) 547 for (object *tmp = op->inv; tmp; tmp = tmp->below)
579 if (tmp->count == count) 548 if (tmp->count == count)
580 return tmp; 549 return tmp;
581 550
582 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 551 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) 552 if (op->head && op->head->count == count)
584 return op; 553 return op;
585 else if (op->count == count) 554 else if (op->count == count)
586 return op; 555 return op;
587 else if (op->type == CONTAINER && pl->container == op) 556 else if (op->type == CONTAINER && pl->container_ () == op)
588 for (tmp = op->inv; tmp; tmp = tmp->below) 557 for (object *tmp = op->inv; tmp; tmp = tmp->below)
589 if (tmp->count == count) 558 if (tmp->count == count)
590 return tmp; 559 return tmp;
591 560
561#if 0
562 /* If the high bit is set, player examined a pseudo object. */
563 if (count & 0x80000000)
564 return 0;
565#endif
566
592 return NULL; 567 return 0;
593} 568}
594
595 569
596/** Client wants to examine some object. So lets do so. */ 570/** Client wants to examine some object. So lets do so. */
597void 571void
598ExamineCmd (char *buf, int len, player *pl) 572ExamineCmd (char *buf, int len, player *pl)
599{ 573{
600 tag_t tag = atoi (buf); 574 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 575
629 /* If the high bit is set, player applied a pseudo object. */ 576 /* If the high bit is set, player applied a pseudo object. */
630 if (tag & 0x80000000) 577 if (tag & 0x80000000)
631 { 578 {
632 pl->socket.look_position = tag & 0x7fffffff; 579 pl->ns->look_position = tag & 0x7fffffff;
633 pl->socket.update_look = 1; 580 pl->ns->floorbox_update ();
634 return; 581 return;
635 } 582 }
636 583
637 object *op = esrv_get_ob_from_count (pl->ob, tag); 584 object *op = esrv_get_ob_from_count (pl->ob, tag);
638 585
639 if (!op) 586 if (!op)
640 { 587 {
588 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
589 return;
590 }
591
592 examine (pl->ob, op);
593}
594
595/** Client wants to examine some object. So lets do so. */
596void
597ExCmd (char *buf, int len, player *pl)
598{
599 tag_t tag = atoi (buf);
600
601 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
602 {
603 std::string s = op->describe (pl->ob);
604
605 packet sl ("ex");
606 sl << ber32 (tag)
607 << data (*pl->expand_cfpod (s.c_str ()));
608
609 pl->ns->send_packet (sl);
610 }
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 /* If the high bit is set, player applied a pseudo object. */
620 if (tag & 0x80000000)
621 {
622 pl->ns->look_position = tag & 0x7fffffff;
623 pl->ns->floorbox_update ();
624 return;
625 }
626
627 object *op = esrv_get_ob_from_count (pl->ob, tag);
628
629 if (!op)
630 {
641 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 631 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
642 return; 632 return;
643 } 633 }
644 634
645 player_apply (pl->ob, op, 0, 0); 635 pl->ob->apply (op, AP_TOGGLE);
646} 636}
647 637
648/** Client wants to apply some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
649void 639void
650LockItem (uint8 *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
651{ 641{
652 int flag = data[0]; 642 int flag = data[0];
653 tag_t tag = net_uint32 (data + 1); 643 tag_t tag = net_uint32 ((uint8 *)data + 1);
654 object *op = esrv_get_ob_from_count (pl->ob, tag); 644 object *op = esrv_get_ob_from_count (pl->ob, tag);
655 645
656 if (!op) 646 if (!op)
657 { 647 {
658 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 648 pl->failmsg ("Could not find object to lock/unlock");
659 return; 649 return;
660 } 650 }
661 651
662 if (!flag) 652 if (!flag)
663 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
664 else 654 else
665 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
666 656
667 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
668} 658}
669 659
670/** Client wants to apply some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
671void 661void
672MarkItem (uint8 * data, int len, player *pl) 662MarkItem (char *data, int len, player *pl)
673{ 663{
674 tag_t tag = net_uint32 (data); 664 tag_t tag = net_uint32 ((uint8 *)data);
675 object *op = esrv_get_ob_from_count (pl->ob, tag); 665 object *op = esrv_get_ob_from_count (pl->ob, tag);
676 666
677 if (!op) 667 if (!op)
678 { 668 {
679 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 669 pl->failmsg ("Could not find object to mark");
680 return; 670 return;
681 } 671 }
682 672
683 pl->mark = op; 673 pl->mark = op;
684 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)));
685} 675}
686 676
687/** 677/**
688 * look_at prints items on the specified square. 678 * look_at prints items on the specified square.
689 * 679 *
690 * [ removed EARTHWALL check and added check for containers inventory. 680 * [ removed EARTHWALL check and added check for containers inventory.
691 * Tero.Haatanen@lut.fi ] 681 * Tero.Haatanen@lut.fi ]
692 */ 682 */
693void 683static void
694look_at (object *op, int dx, int dy) 684look_at (player *pl, int dx, int dy)
695{ 685{
696 object *tmp; 686 dynbuf_text &buf = msg_dynbuf; buf.clear ();
697 int flag = 0; 687 object *ob = pl->ob;
698 sint16 x, y;
699 maptile *m;
700 688
701 x = op->x + dx; 689 if (!pl->observe->map)
702 y = op->y + dy;
703
704 if (out_of_map (op->map, x, y))
705 return; 690 return;
706 691
707 m = get_map_from_coord (op->map, &x, &y); 692 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
708 if (!m)
709 return;
710 693
711 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);
712 696
713 for (; tmp != NULL; tmp = tmp->below) 697 if (wiz)
714 { 698 {
715 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 699 if (pos.normalise ())
716 continue;
717
718 if (!flag)
719 { 700 {
720 if (dx || dy) 701 mapspace &ms = *pos;
721 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 702 ms.update ();
722 else 703
723 { 704 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
724 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",
725 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 706 &pos.m->path, pos.x, pos.y, dx, dy,
726 } 707 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
727 flag = 1; 708 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
709 );
728 } 710 }
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 711 else
733 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 712 buf << "off-map\n\n";
713 }
734 714
735 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 715 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 716
739 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 */
740 break; 742 break;
741 } 743 }
742
743 if (!flag)
744 { 744 }
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 745
746 if (buf.empty ())
747 buf << "You see nothing there.";
752 748
749 pl->infobox (MSG_CHANNEL ("lookat"), buf);
750}
753 751
754/** Client wants to look at some object. Lets do so. */ 752/** Client wants to look at some object. Lets do so. */
755void 753void
756LookAt (char *buf, int len, player *pl) 754LookAt (char *buf, int len, player *pl)
757{ 755{
758 int dx, dy;
759 char *cp; 756 char *cp;
760 757
761 dx = atoi (buf); 758 int dx = atoi (buf);
762 if (!(cp = strchr (buf, ' '))) 759 if (!(cp = strchr (buf, ' ')))
763 {
764 return; 760 return;
765 } 761
766 dy = atoi (cp); 762 int dy = atoi (cp);
767 763
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); 764 look_at (pl, dx, dy);
775} 765}
776 766
777/** Move an object to a new location */ 767/** Move an object to a new location */
778void 768void
779esrv_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)
780{ 770{
781 object *op, *env;
782
783 op = esrv_get_ob_from_count (pl, tag); 771 object *op = esrv_get_ob_from_count (pl, tag);
784 if (!op) 772 if (!op)
785 { 773 {
786 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);
787 return; 775 return;
788 } 776 }
… …
793 return; 781 return;
794 782
795 /* 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
796 * in the container and not the container itself. 784 * in the container and not the container itself.
797 */ 785 */
798 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
799 { 787 {
800 object *current, *next; 788 int cnt = MAX_ITEM_PER_ACTION;
801 789
802 for (current = op->inv; current != NULL; current = next) 790 for (object *current = op->inv; current && cnt--; )
803 { 791 {
804 next = current->below; 792 object *next = current->below;
805 drop_object (pl, current, 0); 793 drop_object (pl, current, 0);
794 current = next;
806 } 795 }
807 796
808 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.");
809 } 799 }
810 else 800 else
811 {
812 drop_object (pl, op, nrof); 801 drop_object (pl, op, nrof);
813 } 802
814 return; 803 return;
815 } 804 }
816 else if (to == pl->count) 805 else if (to == pl->count)
817 { /* pick it up to the inventory */ 806 { /* pick it up to the inventory */
818 /* return if player has already picked it up */ 807 /* return if player has already picked it up */
… …
822 pl->contr->count = nrof; 811 pl->contr->count = nrof;
823 pick_up (pl, op); 812 pick_up (pl, op);
824 return; 813 return;
825 } 814 }
826 815
827 env = esrv_get_ob_from_count (pl, to); 816 object *env = esrv_get_ob_from_count (pl, to);
828 if (!env) 817 if (!env)
829 { 818 {
830 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);
831 return; 820 return;
832 } 821 }
… …
834 /* put_object_in_sack presumes that necessary sanity checking 823 /* put_object_in_sack presumes that necessary sanity checking
835 * 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
836 * 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
837 * 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.
838 */ 827 */
839 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 828 if (env->type == CONTAINER
840 { 829 && can_pick (pl, op)
830 && sack_can_hold (pl, env, op, nrof))
841 put_object_in_sack (pl, env, op, nrof); 831 put_object_in_sack (pl, env, op, nrof);
842 }
843} 832}
844 833

Diff Legend

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