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.80 by root, Mon Oct 19 21:48:49 2009 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 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 53unsigned 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 (QUERY_FLAG (op, 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 (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98 { 95 {
99 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (QUERY_FLAG (op, FLAG_DAMNED))
100 flags |= F_DAMNED; 97 flags |= F_DAMNED;
101 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (QUERY_FLAG (op, FLAG_CURSED))
102 flags |= F_CURSED; 99 flags |= F_CURSED;
103 } 100 }
101
104 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
105 flags |= F_MAGIC; 103 flags |= F_MAGIC;
106 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (QUERY_FLAG (op, FLAG_UNPAID))
107 flags |= F_UNPAID; 105 flags |= F_UNPAID;
108 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (QUERY_FLAG (op, 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]; 119 char item_n[MAX_BUF];
123 const char *item_p; 120 const char *item_p;
124 121
125 flags = query_flags (head); 122 int flags = query_flags (head);
126 if (QUERY_FLAG (head, FLAG_NO_PICK)) 123 if (QUERY_FLAG (head, FLAG_NO_PICK))
127 flags |= F_NOPICK; 124 flags |= F_NOPICK;
128 125
129 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 126 ns.send_face (head->face, -50);
130 esrv_send_face (&ns, head->face->number, 0); 127 ns.flush_fx ();
131 128
132 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 129 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
133 esrv_send_animation (&ns, head->animation_id); 130 ns.send_animation (head->animation_id);
134 131
135 sl << uint32 (head->count) 132 sl << uint32 (head->count)
136 << uint32 (flags) 133 << uint32 (flags)
137 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 134 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
138 << uint32 (head->face->number); 135 << uint32 (head->face);
136
137 int len;
139 138
140 if (!head->custom_name) 139 if (!head->custom_name)
141 { 140 {
142 strncpy (item_n, query_base_name (head, 0), 127); 141 strncpy (item_n, query_base_name (head, 0), 127);
143 item_n[127] = 0; 142 item_n[127] = 0;
… …
157 len += strlen (item_n + 1 + len) + 1; 156 len += strlen (item_n + 1 + len) + 1;
158 157
159 sl << data8 (item_n, len) 158 sl << data8 (item_n, len)
160 << uint16 (head->animation_id); 159 << uint16 (head->animation_id);
161 160
162 anim_speed = 0; 161 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
163 if (QUERY_FLAG (head, FLAG_ANIMATE)) 162 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
164 { 163 : 1. / clamp (fabs (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 164
181 sl << uint8 (anim_speed) 165 sl << uint8 (anim_speed)
182 << uint32 (head->nrof); 166 << uint32 (head->nrof);
183 167
184 if (ns.itemcmd == 2) 168 if (ns.itemcmd == 2)
185 sl << uint16 (head->client_type); 169 sl << uint16 (head->client_type);
186
187 SET_FLAG (head, FLAG_CLIENT_SENT);
188} 170}
189 171
172static faceidx
173need_face_now (player *pl, const char *name)
174{
175 faceidx face = face_find (name, empty_face);
176
177 pl->ns->send_face (face, -50);
178 pl->ns->flush_fx ();
179
180 return face;
181}
182
183#define FINGER_UP "finger_up.x11"
184#define FINGER_DOWN "finger_down.x11"
190 185
191/** 186/**
192 * Send the look window. Don't need to do animations here 187 * 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 188 * This sends all the faces to the client, not just updates. This is
194 * because object ordering would otherwise be inconsistent 189 * because object ordering would otherwise be inconsistent.
195 */ 190 */
196
197void 191void
198esrv_draw_look (object *pl) 192esrv_draw_look (player *pl)
199{ 193{
200 object *tmp, *last; 194 object *ob = pl->ob;
201 int got_one = 0, start_look = 0, end_look = 0;
202 char buf[MAX_BUF];
203 195
204 if (!pl->contr->socket.update_look) 196 if (!pl->ns->update_look)
205 { 197 {
206 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 198 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
207 return; 199 return;
208 } 200 }
209 else 201
210 pl->contr->socket.update_look = 0; 202 pl->ns->update_look = 0;
211 203
212 if (QUERY_FLAG (pl, FLAG_REMOVED) 204 if (QUERY_FLAG (ob, FLAG_REMOVED)
213 || !pl->map 205 || !ob->map
214 || pl->map->in_memory != MAP_IN_MEMORY 206 || ob->map->in_memory != MAP_ACTIVE
215 || out_of_map (pl->map, pl->x, pl->y)) 207 || out_of_map (ob->map, ob->x, ob->y))
216 return; 208 return;
217 209
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 210 pl->ns->send_packet ("delinv 0");
219 ;
220 211
221 SockList sl (MAXSOCKBUF); 212 packet sl;
222
223 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1);
224
225 sl.printf ("item%d ", pl->contr->socket.itemcmd); 213 sl.printf ("item%d ", pl->ns->itemcmd);
226 214
227 sl << uint32 (0); 215 sl << uint32 (0);
228 216
229 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 217 int start_pos = pl->ns->look_position;
230 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 218 bool dirty = false;
231 219
232 if (pl->contr->socket.look_position) 220 mapspace &ms = ob->ms ();
221
222 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
223 // start from the top
224 object *items [FLOORBOX_PAGESIZE];
225 int item_idx = 0, item_cnt = 0;
226 int pos = 0;
227
228 // find our items by walking down
229 object *item = ms.top;
230
231 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
232 {
233 if (!item->client_visible ())
234 continue;
235
236 if (++pos < start_pos)
237 continue;
238
239 // record item
240 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
241 item_cnt++;
242
243 // stop at first floor
244 if (item->flag [FLAG_IS_FLOOR])
245 {
246 // we are finished, don't append "next group of items"
247 // by setting item to ms.bot it becomes zero which is checked after the while loop
248 item = ms.bot;
249 }
233 { 250 }
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 251
252 // see if there are more if we cared - we ignore invisible objects
253 if (item)
254 {
255 /* What we basically do is make a 'fake' object - when the user applies it,
256 * we notice the special tag the object has, and act accordingly.
257 */
258 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
259 << uint32 (0)
260 << uint32 ((uint32) - 1)
261 << uint32 (need_face_now (pl, FINGER_DOWN))
262 << data8 ("Apply this to see the items below")
263 << uint16 (0)
264 << uint8 (0)
265 << uint32 (0);
266
267 if (pl->ns->itemcmd == 2)
268 sl << uint16 (0);
269
270 dirty = true;
271 }
272
273 // now send out all items in the ring buffer in reverse order
274 while (item_cnt)
275 {
276 --item_cnt;
277 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
278 object *item = items [item_idx];
279
280 add_object_to_socklist (*pl->ns, sl, item->head_ ());
281
282 dirty = true;
283
284 // if packet got too large, send it and begin a new one
285 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
286 {
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 { 315 pl->ns->send_packet (sl);
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 }
308
309 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl);
311
312 sl.free ();
313} 316}
314 317
315/** 318/**
316 * Sends whole inventory. 319 * Sends whole inventory.
317 */ 320 */
318void 321void
319esrv_send_inventory (object *pl, object *op) 322esrv_send_inventory (object *pl, object *op)
320{ 323{
321 object *tmp; 324 if (!pl->contr->ns)//D
325 return;
326
322 int got_one = 0; 327 int got_one = 0;
323 328
324 SockList sl (MAXSOCKBUF); 329 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
325 330
326 sl.printf ("delinv %d", op->count); 331 packet sl;
327 Send_With_Handling (&pl->contr->socket, &sl);
328
329 sl.reset ();
330 sl.printf ("item%d ", pl->contr->socket.itemcmd); 332 sl.printf ("item%d ", pl->contr->ns->itemcmd);
331 333
332 sl << uint32 (op->count); 334 sl << uint32 (op->count);
333 335
334 for (tmp = op->inv; tmp; tmp = tmp->below) 336 for (object *tmp = op->inv; tmp; tmp = tmp->below)
335 { 337 {
336 object *head; 338 object *head;
337 339
338 if (tmp->head) 340 if (tmp->head)
339 head = tmp->head; 341 head = tmp->head;
340 else 342 else
341 head = tmp; 343 head = tmp;
342 344
343 if (LOOK_OBJ (head)) 345 if (head->client_visible ())
344 { 346 {
345 add_object_to_socklist (pl->contr->socket, sl, head); 347 add_object_to_socklist (*pl->contr->ns, sl, head);
346 348
347 got_one++; 349 got_one++;
348 350
349 /* IT is possible for players to accumulate a huge amount of 351 /* IT is possible for players to accumulate a huge amount of
350 * items (especially with some of the bags out there) to 352 * items (especially with some of the bags out there) to
351 * overflow the buffer. IF so, send multiple item commands. 353 * overflow the buffer. IF so, send multiple item commands.
352 */ 354 */
353 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 355 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
354 { 356 {
355 Send_With_Handling (&pl->contr->socket, &sl); 357 pl->contr->ns->send_packet (sl);
358
359 sl.reset ();
356 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 360 sl.printf ("item%d ", pl->contr->ns->itemcmd);
357 sl.len = strlen ((char *) sl.buf);
358 sl << uint32 (op->count); 361 sl << uint32 (op->count);
359 got_one = 0; 362 got_one = 0;
360 } 363 }
361 } /* If LOOK_OBJ() */ 364 }
362 } 365 }
363 366
364 if (got_one) 367 if (got_one)
365 Send_With_Handling (&pl->contr->socket, &sl); 368 pl->contr->ns->send_packet (sl);
366
367 sl.free ();
368} 369}
369 370
370/** 371/**
371 * Updates object *op for player *pl. 372 * Updates object *op for player *pl.
372 * 373 *
373 * flags is a list of values to update 374 * flags is a list of values to update
374 * to the client (as defined in newclient.h - might as well use the 375 * to the client (as defined in newclient.h - might as well use the
375 * same value both places. 376 * same value both places.
376 */ 377 */
377
378void 378void
379esrv_update_item (int flags, object *pl, object *op) 379esrv_update_item (int flags, object *pl, object *op)
380{ 380{
381 /* If we have a request to send the player item, skip a few checks. */ 381 /* If we have a request to send the player item, skip a few checks. */
382 if (op != pl) 382 if (op != pl && !op->client_visible ())
383 {
384 if (!LOOK_OBJ (op))
385 return; 383 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 384
392 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 385 client *ns = pl->contr->ns;
393 { 386 if (!ns)
394 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 387 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 388
401 SockList sl (MAXSOCKBUF); 389 packet sl ("upditem");
402 390
403 sl << "upditem "
404 << uint8 (flags); 391 sl << uint8 (flags);
405 392
406 if (op->head)
407 op = op->head; 393 op = op->head_ ();
408 394
409 sl << uint32 (op->count); 395 sl << uint32 (op->count);
410 396
411 if (flags & UPD_LOCATION) 397 if (flags & UPD_LOCATION)
412 sl << uint32 (op->env ? op->env->count : 0); 398 sl << uint32 (op->env ? op->env->count : 0);
… …
414 if (flags & UPD_FLAGS) 400 if (flags & UPD_FLAGS)
415 sl << uint32 (query_flags (op)); 401 sl << uint32 (query_flags (op));
416 402
417 if (flags & UPD_WEIGHT) 403 if (flags & UPD_WEIGHT)
418 { 404 {
419 sint32 weight = WEIGHT (op); 405 sint32 weight = op->client_weight ();
420 406
421 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 407 if (op == pl)
422
423 if (pl == op)
424 op->contr->last_weight = weight; 408 ns->last_weight = weight;
409
410 sl << uint32 (weight);
425 } 411 }
426 412
427 if (flags & UPD_FACE) 413 if (flags & UPD_FACE)
428 { 414 {
429 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 415 ns->send_face (op->face, -50);
430 esrv_send_face (&pl->contr->socket, op->face->number, 0); 416 ns->flush_fx ();
431
432 sl << uint32 (op->face->number); 417 sl << uint32 (op->face);
433 } 418 }
434 419
435 if (flags & UPD_NAME) 420 if (flags & UPD_NAME)
436 { 421 {
437 int len; 422 int len;
438 const char *item_p; 423 const char *item_p;
439 char item_n[MAX_BUF]; 424 char item_n[127 * 2];
440 425
441 if (!op->custom_name) 426 if (!op->custom_name)
442 { 427 {
443 strncpy (item_n, query_base_name (op, 0), 127); 428 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); 429 item_p = query_base_name (op, 1);
447 } 430 }
448 else 431 else
449 { 432 {
450 strncpy (item_n, op->custom_name, 127); 433 len = assign (item_n, &op->custom_name, 127);
451 item_n[127] = 0;
452 len = strlen (item_n);
453 item_p = op->custom_name; 434 item_p = &op->custom_name;
454 } 435 }
455 436
456 strncpy (item_n + len + 1, item_p, 127); 437 len += assign (item_n + len, item_p, 127);
457 item_n[254] = 0;
458 len += strlen (item_n + 1 + len) + 1;
459 438
460 sl << data8 (item_n, len); 439 sl << data8 (item_n, len);
461 } 440 }
462 441
463 if (flags & UPD_ANIM) 442 if (flags & UPD_ANIM)
… …
471 { 450 {
472 if (op->anim_speed) 451 if (op->anim_speed)
473 anim_speed = op->anim_speed; 452 anim_speed = op->anim_speed;
474 else 453 else
475 { 454 {
476 if (FABS (op->speed) < 0.001) 455 if (fabs (op->speed) < 0.001)
477 anim_speed = 255; 456 anim_speed = 255;
478 else if (FABS (op->speed) >= 1.0) 457 else if (fabs (op->speed) >= 1.0)
479 anim_speed = 1; 458 anim_speed = 1;
480 else 459 else
481 anim_speed = (int) (1.0 / FABS (op->speed)); 460 anim_speed = (int) (1.0 / fabs (op->speed));
482 } 461 }
483 462
484 if (anim_speed > 255) 463 if (anim_speed > 255)
485 anim_speed = 255; 464 anim_speed = 255;
486 } 465 }
… …
489 } 468 }
490 469
491 if (flags & UPD_NROF) 470 if (flags & UPD_NROF)
492 sl << uint32 (op->nrof); 471 sl << uint32 (op->nrof);
493 472
494 Send_With_Handling (&pl->contr->socket, &sl); 473 pl->contr->ns->send_packet (sl);
495 sl.free ();
496} 474}
497 475
498/** 476/**
499 * Sends item's info to player. 477 * Sends item's info to player.
500 */ 478 */
501void 479void
502esrv_send_item (object *pl, object *op) 480esrv_send_item (object *pl, object *op)
503{ 481{
504 /* If this is not the player object, do some more checks */ 482 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; 483 return;
510 /* if the item is on the ground, mark that the look needs to 484
511 * be updated. 485 /* We only send 'visible' objects to the client, and sometimes the player */
512 */ 486 if (!op->client_visible () && op->type != PLAYER)
513 if (!op->env)
514 {
515 pl->contr->socket.update_look = 1;
516 return; 487 return;
517 }
518 }
519 488
520 SockList sl (MAXSOCKBUF); 489 packet sl;
521 490
522 sl.printf ("item%d ", pl->contr->socket.itemcmd); 491 sl.printf ("item%d ", pl->contr->ns->itemcmd);
523 492
524 if (op->head)
525 op = op->head; 493 op = op->head_ ();
526 494
527 sl << uint32 (op->env ? op->env->count : 0); 495 sl << uint32 (op->env ? op->env->count : 0);
528 496
529 add_object_to_socklist (pl->contr->socket, sl, op); 497 add_object_to_socklist (*pl->contr->ns, sl, op);
530 498
531 Send_With_Handling (&pl->contr->socket, &sl); 499 pl->contr->ns->send_packet (sl);
532 SET_FLAG (op, FLAG_CLIENT_SENT);
533
534 sl.free ();
535} 500}
536 501
537/** 502/**
538 * Tells the client to delete an item. Uses the item 503 * Tells the client to delete an item.
539 * command with a -1 location.
540 */ 504 */
541
542void 505void
543esrv_del_item (player *pl, int tag) 506esrv_del_item (player *pl, int tag)
544{ 507{
545 SockList sl (MAXSOCKBUF); 508 if (!pl->ns)
509 return;
546 510
547 sl << "delitem " 511 packet sl ("delitem");
512
548 << uint32 (tag); 513 sl << uint32 (tag);
549 514
550 Send_With_Handling (&pl->socket, &sl); 515 pl->ns->send_packet (sl);
551 sl.free ();
552} 516}
553 517
554 518
555/******************************************************************************* 519/*******************************************************************************
556 * 520 *
… …
560 524
561/** 525/**
562 * Takes a player and object count (tag) and returns the actual object 526 * Takes a player and object count (tag) and returns the actual object
563 * pointer, or null if it can't be found. 527 * pointer, or null if it can't be found.
564 */ 528 */
565
566object * 529object *
567esrv_get_ob_from_count (object *pl, tag_t count) 530esrv_get_ob_from_count (object *pl, tag_t count)
568{ 531{
569 object *op, *tmp;
570
571 if (pl->count == count) 532 if (pl->count == count)
572 return pl; 533 return pl;
573 534
574 for (op = pl->inv; op; op = op->below) 535 for (object *op = pl->inv; op; op = op->below)
575 if (op->count == count) 536 if (op->count == count)
576 return op; 537 return op;
577 else if (op->type == CONTAINER && pl->container == op) 538 else if (op->type == CONTAINER && pl->container_ () == op)
578 for (tmp = op->inv; tmp; tmp = tmp->below) 539 for (object *tmp = op->inv; tmp; tmp = tmp->below)
579 if (tmp->count == count) 540 if (tmp->count == count)
580 return tmp; 541 return tmp;
581 542
582 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 543 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) 544 if (op->head && op->head->count == count)
584 return op; 545 return op;
585 else if (op->count == count) 546 else if (op->count == count)
586 return op; 547 return op;
587 else if (op->type == CONTAINER && pl->container == op) 548 else if (op->type == CONTAINER && pl->container_ () == op)
588 for (tmp = op->inv; tmp; tmp = tmp->below) 549 for (object *tmp = op->inv; tmp; tmp = tmp->below)
589 if (tmp->count == count) 550 if (tmp->count == count)
590 return tmp; 551 return tmp;
591 552
553#if 0
554 /* If the high bit is set, player examined a pseudo object. */
555 if (count & 0x80000000)
556 return 0;
557#endif
558
592 return NULL; 559 return 0;
593} 560}
594
595 561
596/** Client wants to examine some object. So lets do so. */ 562/** Client wants to examine some object. So lets do so. */
597void 563void
598ExamineCmd (char *buf, int len, player *pl) 564ExamineCmd (char *buf, int len, player *pl)
599{ 565{
600 tag_t tag = atoi (buf); 566 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 567
629 /* If the high bit is set, player applied a pseudo object. */ 568 /* If the high bit is set, player applied a pseudo object. */
630 if (tag & 0x80000000) 569 if (tag & 0x80000000)
631 { 570 {
632 pl->socket.look_position = tag & 0x7fffffff; 571 pl->ns->look_position = tag & 0x7fffffff;
633 pl->socket.update_look = 1; 572 pl->ns->floorbox_update ();
634 return; 573 return;
635 } 574 }
636 575
637 object *op = esrv_get_ob_from_count (pl->ob, tag); 576 object *op = esrv_get_ob_from_count (pl->ob, tag);
638 577
639 if (!op) 578 if (!op)
640 { 579 {
580 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
581 return;
582 }
583
584 examine (pl->ob, op);
585}
586
587/** Client wants to examine some object. So lets do so. */
588void
589ExCmd (char *buf, int len, player *pl)
590{
591 tag_t tag = atoi (buf);
592
593 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
594 {
595 std::string s = op->describe (pl->ob);
596
597 packet sl ("ex");
598 sl << ber32 (tag)
599 << data (*pl->expand_cfpod (s.c_str ()));
600
601 pl->ns->send_packet (sl);
602 }
603}
604
605/** Client wants to apply some object. Lets do so. */
606void
607ApplyCmd (char *buf, int len, player *pl)
608{
609 tag_t tag = atoi (buf);
610
611 /* If the high bit is set, player applied a pseudo object. */
612 if (tag & 0x80000000)
613 {
614 pl->ns->look_position = tag & 0x7fffffff;
615 pl->ns->floorbox_update ();
616 return;
617 }
618
619 object *op = esrv_get_ob_from_count (pl->ob, tag);
620
621 if (!op)
622 {
641 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 623 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
642 return; 624 return;
643 } 625 }
644 626
645 player_apply (pl->ob, op, 0, 0); 627 player_apply (pl->ob, op, 0, 0);
646} 628}
647 629
648/** Client wants to apply some object. Lets do so. */ 630/** Client wants to lock some object. Lets do so. */
649void 631void
650LockItem (uint8 *data, int len, player *pl) 632LockItem (char *data, int len, player *pl)
651{ 633{
652 int flag = data[0]; 634 int flag = data[0];
653 tag_t tag = net_uint32 (data + 1); 635 tag_t tag = net_uint32 ((uint8 *)data + 1);
654 object *op = esrv_get_ob_from_count (pl->ob, tag); 636 object *op = esrv_get_ob_from_count (pl->ob, tag);
655 637
656 if (!op) 638 if (!op)
657 { 639 {
658 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 640 pl->failmsg ("Could not find object to lock/unlock");
659 return; 641 return;
660 } 642 }
661 643
662 if (!flag) 644 if (!flag)
663 CLEAR_FLAG (op, FLAG_INV_LOCKED); 645 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
665 SET_FLAG (op, FLAG_INV_LOCKED); 647 SET_FLAG (op, FLAG_INV_LOCKED);
666 648
667 esrv_update_item (UPD_FLAGS, pl->ob, op); 649 esrv_update_item (UPD_FLAGS, pl->ob, op);
668} 650}
669 651
670/** Client wants to apply some object. Lets do so. */ 652/** Client wants to mark some object. Lets do so. */
671void 653void
672MarkItem (uint8 * data, int len, player *pl) 654MarkItem (char *data, int len, player *pl)
673{ 655{
674 tag_t tag = net_uint32 (data); 656 tag_t tag = net_uint32 ((uint8 *)data);
675 object *op = esrv_get_ob_from_count (pl->ob, tag); 657 object *op = esrv_get_ob_from_count (pl->ob, tag);
676 658
677 if (!op) 659 if (!op)
678 { 660 {
679 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 661 pl->failmsg ("Could not find object to mark");
680 return; 662 return;
681 } 663 }
682 664
683 pl->mark = op; 665 pl->mark = op;
684 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 666 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
685} 667}
686 668
687/** 669/**
688 * look_at prints items on the specified square. 670 * look_at prints items on the specified square.
689 * 671 *
690 * [ removed EARTHWALL check and added check for containers inventory. 672 * [ removed EARTHWALL check and added check for containers inventory.
691 * Tero.Haatanen@lut.fi ] 673 * Tero.Haatanen@lut.fi ]
692 */ 674 */
693void 675static void
694look_at (object *op, int dx, int dy) 676look_at (player *pl, int dx, int dy)
695{ 677{
696 object *tmp; 678 dynbuf_text &buf = msg_dynbuf; buf.clear ();
697 int flag = 0; 679 object *ob = pl->ob;
698 sint16 x, y;
699 maptile *m;
700 680
701 x = op->x + dx; 681 if (!pl->observe->map)
702 y = op->y + dy;
703
704 if (out_of_map (op->map, x, y))
705 return; 682 return;
706 683
707 m = get_map_from_coord (op->map, &x, &y); 684 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
708 if (!m) 685
686 mapxy pos (pl->observe);
687 pos.move (dx, dy);
688
689 if (wiz)
690 {
691 if (pos.normalise ())
692 {
693 mapspace &ms = *pos;
694 ms.update ();
695
696 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
697 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
698 &pos.m->path, pos.x, pos.y, dx, dy,
699 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
700 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
701 );
702 }
703 else
704 buf << "off-map\n\n";
705 }
706
707 int darkness = pl->blocked_los (dx, dy);
708
709 if (darkness == LOS_BLOCKED)
710 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
711 else if (darkness == LOS_MAX)
712 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
713 else
714 {
715 if (pos.normalise ())
716 for (object *tmp = pos->top; tmp; tmp = tmp->below)
717 {
718 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
719 continue;
720
721 if (wiz)
722 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
723 else
724 buf.printf (" - %s.\n", query_name (tmp));
725
726 object *head = tmp->head_ ();
727
728 if (head->inv)
729 if ((head->type != CONTAINER && head->type != FLESH)
730 || QUERY_FLAG (ob, FLAG_WIZ))
731 buf << head->query_inventory (ob, " ");
732
733 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
734 break;
735 }
736 }
737
738 if (buf.empty ())
739 buf << "You see nothing there.";
740
741 pl->infobox (MSG_CHANNEL ("lookat"), buf);
742}
743
744/** Client wants to look at some object. Lets do so. */
745void
746LookAt (char *buf, int len, player *pl)
747{
748 char *cp;
749
750 int dx = atoi (buf);
751 if (!(cp = strchr (buf, ' ')))
709 return; 752 return;
710 753
711 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
712
713 for (; tmp != NULL; tmp = tmp->below)
714 {
715 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
716 continue;
717
718 if (!flag)
719 {
720 if (dx || dy)
721 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
722 else
723 {
724 clear_win_info (op);
725 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
726 }
727 flag = 1;
728 }
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
733 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
734
735 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
736 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
737 inventory (op, tmp->head == NULL ? tmp : tmp->head);
738
739 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
740 break;
741 }
742
743 if (!flag)
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
752
753
754/** Client wants to look at some object. Lets do so. */
755void
756LookAt (char *buf, int len, player *pl)
757{
758 int dx, dy;
759 char *cp;
760
761 dx = atoi (buf);
762 if (!(cp = strchr (buf, ' ')))
763 {
764 return;
765 }
766 dy = atoi (cp); 754 int dy = atoi (cp);
767 755
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); 756 look_at (pl, dx, dy);
775} 757}
776 758
777/** Move an object to a new location */ 759/** Move an object to a new location */
778void 760void
779esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 761esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
780{ 762{
781 object *op, *env;
782
783 op = esrv_get_ob_from_count (pl, tag); 763 object *op = esrv_get_ob_from_count (pl, tag);
784 if (!op) 764 if (!op)
785 { 765 {
786 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 766 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
787 return; 767 return;
788 } 768 }
… …
795 /* If it is an active container, then we should drop all objects 775 /* If it is an active container, then we should drop all objects
796 * in the container and not the container itself. 776 * in the container and not the container itself.
797 */ 777 */
798 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 778 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
799 { 779 {
800 object *current, *next; 780 int cnt = MAX_ITEM_PER_DROP;
801 781
802 for (current = op->inv; current != NULL; current = next) 782 for (object *current = op->inv; current && cnt--; )
803 { 783 {
804 next = current->below; 784 object *next = current->below;
805 drop_object (pl, current, 0); 785 drop_object (pl, current, 0);
786 current = next;
806 } 787 }
807 788
808 esrv_update_item (UPD_WEIGHT, pl, op); 789 if (cnt <= 0)
790 op->failmsg ("Only dropped some items, can't drop that many items at once.");
809 } 791 }
810 else 792 else
811 {
812 drop_object (pl, op, nrof); 793 drop_object (pl, op, nrof);
813 } 794
814 return; 795 return;
815 } 796 }
816 else if (to == pl->count) 797 else if (to == pl->count)
817 { /* pick it up to the inventory */ 798 { /* pick it up to the inventory */
818 /* return if player has already picked it up */ 799 /* return if player has already picked it up */
… …
822 pl->contr->count = nrof; 803 pl->contr->count = nrof;
823 pick_up (pl, op); 804 pick_up (pl, op);
824 return; 805 return;
825 } 806 }
826 807
827 env = esrv_get_ob_from_count (pl, to); 808 object *env = esrv_get_ob_from_count (pl, to);
828 if (!env) 809 if (!env)
829 { 810 {
830 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 811 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
831 return; 812 return;
832 } 813 }
… …
834 /* put_object_in_sack presumes that necessary sanity checking 815 /* put_object_in_sack presumes that necessary sanity checking
835 * has already been done (eg, it can be picked up and fits in 816 * 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 817 * 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. 818 * an make sure env is in fact a container for that matter.
838 */ 819 */
839 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 820 if (env->type == CONTAINER
840 { 821 && can_pick (pl, op)
822 && sack_can_hold (pl, env, op, nrof))
841 put_object_in_sack (pl, env, op, nrof); 823 put_object_in_sack (pl, env, op, nrof);
842 }
843} 824}
844 825

Diff Legend

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