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

Diff Legend

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