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.24 by root, Sat Dec 16 22:14:42 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#include <global.h> 36#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** 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 */
40#define MAXITEMLEN 300 41#define MAXITEMLEN 300
41 42
… …
47 48
48/** 49/**
49 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
50 * to be sent to client. 51 * to be sent to client.
51 */ 52 */
52unsigned int 53static unsigned int
53query_flags (object *op) 54query_flags (object *op)
54{ 55{
55 unsigned int flags = 0; 56 unsigned int flags = 0;
56 57
57 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (QUERY_FLAG (op, FLAG_APPLIED))
58 {
59 switch (op->type) 59 switch (op->type)
60 { 60 {
61 case BOW: 61 case BOW:
62 case WAND: 62 case WAND:
63 case ROD: 63 case ROD:
64 case HORN: 64 case HORN:
65 flags = a_readied; 65 flags = a_readied;
66 break; 66 break;
67 case WEAPON: 67 case WEAPON:
68 flags = a_wielded; 68 flags = a_wielded;
69 break; 69 break;
70 case SKILL: 70 case SKILL:
71 case ARMOUR: 71 case ARMOUR:
72 case HELMET: 72 case HELMET:
73 case SHIELD: 73 case SHIELD:
74 case RING: 74 case RING:
75 case BOOTS: 75 case BOOTS:
76 case GLOVES: 76 case GLOVES:
77 case AMULET: 77 case AMULET:
78 case GIRDLE: 78 case GIRDLE:
79 case BRACERS: 79 case BRACERS:
80 case CLOAK: 80 case CLOAK:
81 flags = a_worn; 81 flags = a_worn;
82 break; 82 break;
83 case CONTAINER: 83 case CONTAINER:
84 flags = a_active; 84 flags = a_active;
85 break; 85 break;
86 default: 86 default:
87 flags = a_applied; 87 flags = a_applied;
88 break; 88 break;
89 } 89 }
90 }
91 90
92 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
93 flags |= F_OPEN; 92 flags |= F_OPEN;
94 93
95 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
96 { 95 {
97 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
115 * animation of face to the client. 114 * animation of face to the client.
116 */ 115 */
117static void 116static void
118add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
119{ 118{
120 int flags, len, anim_speed;
121 char item_n[MAX_BUF];
122 const char *item_p;
123
124 flags = query_flags (head); 119 int flags = query_flags (head);
120
125 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (QUERY_FLAG (head, FLAG_NO_PICK))
126 flags |= F_NOPICK; 122 flags |= F_NOPICK;
127 123
128 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 124 ns.send_face (head->face, -50);
129 esrv_send_face (&ns, head->face->number, 0);
130 125
131 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])
132 esrv_send_animation (&ns, head->animation_id); 127 ns.send_animation (head->animation_id);
133 128
134 sl << uint32 (head->count) 129 sl << uint32 (head->count)
135 << uint32 (flags) 130 << uint32 (flags)
136 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 131 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
137 << uint32 (head->face->number); 132 << uint32 (head->face);
138 133
139 if (!head->custom_name) 134 if (!head->custom_name)
140 { 135 {
141 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
142 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
143 len = strlen (item_n); 138
144 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;
145 } 144 }
146 else 145 else
147 { 146 {
148 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
149 item_n[127] = 0;
150 len = strlen (item_n);
151 item_p = head->custom_name;
152 }
153 148
154 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
155 item_n[254] = 0; 150 << data (head->custom_name, len)
156 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
157 154
158 sl << data8 (item_n, len)
159 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
160 156
161 anim_speed = 0; 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
162 if (QUERY_FLAG (head, FLAG_ANIMATE)) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
163 { 159 : 1. / clamp (head->speed, 1./255., 1./1.);
164 if (head->anim_speed)
165 anim_speed = head->anim_speed;
166 else
167 {
168 if (FABS (head->speed) < 0.001)
169 anim_speed = 255;
170 else if (FABS (head->speed) >= 1.0)
171 anim_speed = 1;
172 else
173 anim_speed = (int) (1.0 / FABS (head->speed));
174 }
175
176 if (anim_speed > 255)
177 anim_speed = 255;
178 }
179 160
180 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
181 << uint32 (head->nrof); 162 << uint32 (head->nrof);
182 163
183 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
184 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
185
186 SET_FLAG (head, FLAG_CLIENT_SENT);
187} 166}
188 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"
189 181
190/** 182/**
191 * Send the look window. Don't need to do animations here 183 * Send the look window. Don't need to do animations here
192 * 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
193 * because object ordering would otherwise be inconsistent. 185 * because object ordering would otherwise be inconsistent.
194 */ 186 */
195void 187void
196esrv_draw_look (object *pl) 188esrv_draw_look (player *pl)
197{ 189{
198 object *tmp, *last; 190 object *ob = pl->ob;
199 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF];
201 191
202 if (!pl->contr->socket->update_look) 192 if (!pl->ns->update_look)
203 { 193 {
204 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);
205 return; 195 return;
206 } 196 }
207 else 197
208 pl->contr->socket->update_look = 0; 198 pl->ns->update_look = 0;
209 199
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 200 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 201 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 202 || ob->map->in_memory != MAP_ACTIVE
213 || out_of_map (pl->map, pl->x, pl->y)) 203 || out_of_map (ob->map, ob->x, ob->y))
214 return; 204 return;
215 205
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 206 pl->ns->send_packet ("delinv 0");
217 ;
218 207
219 packet sl; 208 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 209 sl.printf ("item%d ", pl->ns->itemcmd);
224 210
225 sl << uint32 (0); 211 sl << uint32 (0);
226 212
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 213 int start_pos = pl->ns->look_position;
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 214 bool dirty = false;
229 215
230 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 }
231 { 246 }
232 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234 247
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 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))
236 << uint32 (0) 255 << uint32 (0)
237 << sint32 (-1) 256 << uint32 ((uint32) - 1)
238 << uint32 (empty_face->number) 257 << uint32 (need_face_now (pl, FINGER_DOWN))
239 << data8 (buf) 258 << data8 ("Apply this to see the items below")
240 << uint16 (0) 259 << uint16 (0)
241 << uint8 (0) 260 << uint8 (0)
242 << uint32 (0); 261 << uint32 (0);
243 262
244 if (pl->contr->socket->itemcmd == 2) 263 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 264 sl << uint16 (0);
246 }
247 265
248 for (last = NULL; tmp != last; tmp = tmp->below) 266 dirty = true;
249 { 267 }
250 object *head;
251 268
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 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)
253 { 282 {
254 last = tmp->below; /* assumes double floor mode */ 283 pl->ns->flush_fx ();
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 284 pl->ns->send_packet (sl);
256 last = last->below; 285
286 sl.reset ();
287 sl.printf ("item%d ", pl->ns->itemcmd);
288 sl << uint32 (0);
289
290 dirty = false;
257 } 291 }
258
259 if (LOOK_OBJ (tmp))
260 {
261 if (++start_look < pl->contr->socket->look_position)
262 continue;
263
264 end_look++;
265
266 if (end_look > NUM_LOOK_OBJECTS)
267 {
268 /* What we basically do is make a 'fake' object - when the user applies it,
269 * we notice the special tag the object has, and act accordingly.
270 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
272 << uint32 (0)
273 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number)
275 << data8 ("Apply this to see next group of items")
276 << uint16 (0)
277 << uint8 (0)
278 << uint32 (0);
279
280 if (pl->contr->socket->itemcmd == 2)
281 sl << uint16 (0);
282
283 break;
284 }
285
286 if (tmp->head)
287 head = tmp->head;
288 else
289 head = tmp;
290
291 add_object_to_socklist (*pl->contr->socket, sl, head);
292 got_one++;
293
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 {
296 pl->contr->socket->send_packet (sl);
297
298 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd);
300 sl << uint32 (0);
301 got_one = 0;
302 }
303 }
304 } 292 }
305 293
306 if (got_one) 294 if (start_pos)
295 {
296 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
297 << uint32 (0)
298 << sint32 (-1)
299 << uint32 (need_face_now (pl, FINGER_UP))
300 << data8 ("Apply this to see the items higher up")
301 << uint16 (0)
302 << uint8 (0)
303 << uint32 (0);
304
305 if (pl->ns->itemcmd == 2)
306 sl << uint16 (0);
307
308 dirty = true;
309 }
310
311 if (dirty)
312 {
313 pl->ns->flush_fx ();
307 pl->contr->socket->send_packet (sl); 314 pl->ns->send_packet (sl);
308 315 }
309} 316}
310 317
311/** 318/**
312 * Sends whole inventory. 319 * Sends whole inventory.
313 */ 320 */
314void 321void
315esrv_send_inventory (object *pl, object *op) 322esrv_send_inventory (object *pl, object *op)
316{ 323{
317 object *tmp; 324 if (!pl->contr->ns)//D
325 return;
326
318 int got_one = 0; 327 int got_one = 0;
319 328
329 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
330
320 packet sl; 331 packet sl;
321
322 sl.printf ("delinv %d", op->count);
323 pl->contr->socket->send_packet (sl);
324
325 sl.reset ();
326 sl.printf ("item%d ", pl->contr->socket->itemcmd); 332 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 333
328 sl << uint32 (op->count); 334 sl << uint32 (op->count);
329 335
330 for (tmp = op->inv; tmp; tmp = tmp->below) 336 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 337 {
332 object *head; 338 object *head;
333 339
334 if (tmp->head) 340 if (tmp->head)
335 head = tmp->head; 341 head = tmp->head;
336 else 342 else
337 head = tmp; 343 head = tmp;
338 344
339 if (LOOK_OBJ (head)) 345 if (head->client_visible ())
340 { 346 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 347 add_object_to_socklist (*pl->contr->ns, sl, head);
342 348
343 got_one++; 349 got_one++;
344 350
345 /* IT is possible for players to accumulate a huge amount of 351 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 352 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 353 * overflow the buffer. IF so, send multiple item commands.
348 */ 354 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 355 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
350 { 356 {
357 pl->contr->ns->flush_fx ();
351 pl->contr->socket->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
352 359
353 sl.reset (); 360 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 362 sl << uint32 (op->count);
356 got_one = 0; 363 got_one = 0;
357 } 364 }
358 } /* If LOOK_OBJ() */ 365 }
359 } 366 }
360 367
361 if (got_one) 368 if (got_one)
369 {
370 pl->contr->ns->flush_fx ();
362 pl->contr->socket->send_packet (sl); 371 pl->contr->ns->send_packet (sl);
372 }
363} 373}
364 374
365/** 375/**
366 * Updates object *op for player *pl. 376 * Updates object *op for player *pl.
367 * 377 *
368 * flags is a list of values to update 378 * flags is a list of values to update
369 * 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
370 * same value both places. 380 * same value both places.
371 */ 381 */
372
373void 382void
374esrv_update_item (int flags, object *pl, object *op) 383esrv_update_item (int flags, object *pl, object *op)
375{ 384{
376 /* 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. */
377 if (op != pl) 386 if (op != pl && !op->client_visible ())
378 {
379 if (!LOOK_OBJ (op))
380 return; 387 return;
381 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve
383 * order.
384 */
385 }
386 388
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 389 client *ns = pl->contr->ns;
388 { 390 if (!ns)
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 return;
390 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call.
392 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 }
395 392
396 packet sl; 393 packet sl ("upditem");
397 394
398 sl << "upditem "
399 << uint8 (flags); 395 sl << uint8 (flags);
400 396
401 if (op->head)
402 op = op->head; 397 op = op->head_ ();
403 398
404 sl << uint32 (op->count); 399 sl << uint32 (op->count);
405 400
406 if (flags & UPD_LOCATION) 401 if (flags & UPD_LOCATION)
407 sl << uint32 (op->env ? op->env->count : 0); 402 sl << uint32 (op->env ? op->env->count : 0);
… …
409 if (flags & UPD_FLAGS) 404 if (flags & UPD_FLAGS)
410 sl << uint32 (query_flags (op)); 405 sl << uint32 (query_flags (op));
411 406
412 if (flags & UPD_WEIGHT) 407 if (flags & UPD_WEIGHT)
413 { 408 {
414 sint32 weight = WEIGHT (op); 409 sint32 weight = op->client_weight ();
415 410
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 411 if (op == pl)
417
418 if (pl == op)
419 op->contr->last_weight = weight; 412 ns->last_weight = weight;
413
414 sl << uint32 (weight);
420 } 415 }
421 416
422 if (flags & UPD_FACE) 417 if (flags & UPD_FACE)
423 { 418 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 419 ns->send_face (op->face, -50);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 420 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 421 sl << uint32 (op->face);
428 } 422 }
429 423
430 if (flags & UPD_NAME) 424 if (flags & UPD_NAME)
431 { 425 {
432 int len; 426 int len;
433 const char *item_p; 427 const char *item_p;
434 char item_n[MAX_BUF]; 428 char item_n[127 * 2];
435 429
436 if (!op->custom_name) 430 if (!op->custom_name)
437 { 431 {
438 strncpy (item_n, query_base_name (op, 0), 127); 432 len = assign (item_n, query_base_name (op, 0), 127);
439 item_n[127] = 0;
440 len = strlen (item_n);
441 item_p = query_base_name (op, 1); 433 item_p = query_base_name (op, 1);
442 } 434 }
443 else 435 else
444 { 436 {
445 strncpy (item_n, op->custom_name, 127); 437 len = assign (item_n, &op->custom_name, 127);
446 item_n[127] = 0;
447 len = strlen (item_n);
448 item_p = op->custom_name; 438 item_p = &op->custom_name;
449 } 439 }
450 440
451 strncpy (item_n + len + 1, item_p, 127); 441 len += assign (item_n + len, item_p, 127);
452 item_n[254] = 0;
453 len += strlen (item_n + 1 + len) + 1;
454 442
455 sl << data8 (item_n, len); 443 sl << data8 (item_n, len);
456 } 444 }
457 445
458 if (flags & UPD_ANIM) 446 if (flags & UPD_ANIM)
… …
466 { 454 {
467 if (op->anim_speed) 455 if (op->anim_speed)
468 anim_speed = op->anim_speed; 456 anim_speed = op->anim_speed;
469 else 457 else
470 { 458 {
471 if (FABS (op->speed) < 0.001) 459 if (op->speed < 0.001)
472 anim_speed = 255; 460 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 461 else if (op->speed >= 1.0)
474 anim_speed = 1; 462 anim_speed = 1;
475 else 463 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 464 anim_speed = 1. / op->speed;
477 } 465 }
478 466
479 if (anim_speed > 255) 467 if (anim_speed > 255)
480 anim_speed = 255; 468 anim_speed = 255;
481 } 469 }
… …
484 } 472 }
485 473
486 if (flags & UPD_NROF) 474 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 475 sl << uint32 (op->nrof);
488 476
489 pl->contr->socket->send_packet (sl); 477 pl->contr->ns->send_packet (sl);
490} 478}
491 479
492/** 480/**
493 * Sends item's info to player. 481 * Sends item's info to player.
494 */ 482 */
495void 483void
496esrv_send_item (object *pl, object *op) 484esrv_send_item (object *pl, object *op)
497{ 485{
498 /* If this is not the player object, do some more checks */ 486 if (!pl->contr->ns)
499 if (op != pl)
500 {
501 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op))
503 return; 487 return;
504 /* if the item is on the ground, mark that the look needs to 488
505 * be updated. 489 /* We only send 'visible' objects to the client, and sometimes the player */
506 */ 490 if (!op->client_visible () && op->type != PLAYER)
507 if (!op->env)
508 {
509 pl->contr->socket->update_look = 1;
510 return; 491 return;
511 }
512 }
513 492
514 packet sl; 493 packet sl;
515 494
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 495 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 496
518 if (op->head)
519 op = op->head; 497 op = op->head_ ();
520 498
521 sl << uint32 (op->env ? op->env->count : 0); 499 sl << uint32 (op->env ? op->env->count : 0);
522 500
523 add_object_to_socklist (*pl->contr->socket, sl, op); 501 add_object_to_socklist (*pl->contr->ns, sl, op);
524 502
503 pl->contr->ns->flush_fx ();
525 pl->contr->socket->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 505}
528 506
529/** 507/**
530 * Tells the client to delete an item. Uses the item 508 * Tells the client to delete an item.
531 * command with a -1 location.
532 */ 509 */
533
534void 510void
535esrv_del_item (player *pl, int tag) 511esrv_del_item (player *pl, int tag)
536{ 512{
537 packet sl; 513 if (!pl->ns)
514 return;
538 515
539 sl << "delitem " 516 packet sl ("delitem");
517
540 << uint32 (tag); 518 sl << uint32 (tag);
541 519
542 pl->socket->send_packet (sl); 520 pl->ns->send_packet (sl);
543} 521}
544 522
545 523
546/******************************************************************************* 524/*******************************************************************************
547 * 525 *
… …
551 529
552/** 530/**
553 * 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
554 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
555 */ 533 */
556 534static object *
557object *
558esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
559{ 536{
560 object *op, *tmp;
561
562 if (pl->count == count) 537 if (pl->count == count)
563 return pl; 538 return pl;
564 539
565 for (op = pl->inv; op; op = op->below) 540 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 541 if (op->count == count)
567 return op; 542 return op;
568 else if (op->type == CONTAINER && pl->container == op) 543 else if (op->type == CONTAINER && pl->container_ () == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 544 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 545 if (tmp->count == count)
571 return tmp; 546 return tmp;
572 547
573 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)
574 if (op->head && op->head->count == count) 549 if (op->head && op->head->count == count)
575 return op; 550 return op;
576 else if (op->count == count) 551 else if (op->count == count)
577 return op; 552 return op;
578 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container_ () == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 555 if (tmp->count == count)
581 return tmp; 556 return tmp;
582 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
583 return 0; 564 return 0;
584} 565}
585 566
586
587/** Client wants to examine some object. So lets do so. */ 567/** Client wants to examine some object. So lets do so. */
588void 568void
589ExamineCmd (char *buf, int len, player *pl) 569ExamineCmd (char *buf, int len, player *pl)
590{ 570{
591 tag_t tag = atoi (buf); 571 tag_t tag = atoi (buf);
592
593 /* If the high bit is set, player examined a pseudo object. */
594 if (tag & 0x80000000)
595 return;
596
597 object *op = esrv_get_ob_from_count (pl->ob, tag);
598
599 if (!op)
600 {
601 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
602 return;
603 }
604
605 examine (pl->ob, op);
606}
607
608/** Client wants to apply some object. Lets do so. */
609void
610ApplyCmd (char *buf, int len, player *pl)
611{
612 tag_t tag = atoi (buf);
613
614 /* sort of a hack, but if the player saves and the player then manually
615 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
616 */
617 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
618 return;
619 572
620 /* If the high bit is set, player applied a pseudo object. */ 573 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 574 if (tag & 0x80000000)
622 { 575 {
623 pl->socket->look_position = tag & 0x7fffffff; 576 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 577 pl->ns->floorbox_update ();
625 return; 578 return;
626 } 579 }
627 580
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 581 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 582
630 if (!op) 583 if (!op)
631 { 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 {
632 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);
633 return; 629 return;
634 } 630 }
635 631
636 player_apply (pl->ob, op, 0, 0); 632 pl->ob->apply (op, AP_TOGGLE);
637} 633}
638 634
639/** Client wants to apply some object. Lets do so. */ 635/** Client wants to lock some object. Lets do so. */
640void 636void
641LockItem (char *data, int len, player *pl) 637LockItem (char *data, int len, player *pl)
642{ 638{
643 int flag = data[0]; 639 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 640 tag_t tag = net_uint32 ((uint8 *)data + 1);
645 object *op = esrv_get_ob_from_count (pl->ob, tag); 641 object *op = esrv_get_ob_from_count (pl->ob, tag);
646 642
647 if (!op) 643 if (!op)
648 { 644 {
649 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");
650 return; 646 return;
651 } 647 }
652 648
653 if (!flag) 649 if (!flag)
654 CLEAR_FLAG (op, FLAG_INV_LOCKED); 650 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 652 SET_FLAG (op, FLAG_INV_LOCKED);
657 653
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 654 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 655}
660 656
661/** Client wants to apply some object. Lets do so. */ 657/** Client wants to mark some object. Lets do so. */
662void 658void
663MarkItem (char *data, int len, player *pl) 659MarkItem (char *data, int len, player *pl)
664{ 660{
665 tag_t tag = net_uint32 ((uint8 *)data); 661 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 662 object *op = esrv_get_ob_from_count (pl->ob, tag);
667 663
668 if (!op) 664 if (!op)
669 { 665 {
670 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 666 pl->failmsg ("Could not find object to mark");
671 return; 667 return;
672 } 668 }
673 669
674 pl->mark = op; 670 pl->mark = op;
675 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)));
676} 672}
677 673
678/** 674/**
679 * look_at prints items on the specified square. 675 * look_at prints items on the specified square.
680 * 676 *
681 * [ removed EARTHWALL check and added check for containers inventory. 677 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 678 * Tero.Haatanen@lut.fi ]
683 */ 679 */
684void 680static void
685look_at (object *op, int dx, int dy) 681look_at (player *pl, int dx, int dy)
686{ 682{
687 object *tmp; 683 dynbuf_text &buf = msg_dynbuf; buf.clear ();
688 int flag = 0; 684 object *ob = pl->ob;
689 sint16 x, y;
690 maptile *m;
691 685
692 x = op->x + dx; 686 if (!pl->observe->map)
693 y = op->y + dy;
694
695 if (out_of_map (op->map, x, y))
696 return; 687 return;
697 688
698 m = get_map_from_coord (op->map, &x, &y); 689 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
699 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, ' ')))
700 return; 757 return;
701 758
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
703
704 for (; tmp != NULL; tmp = tmp->below)
705 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707 continue;
708
709 if (!flag)
710 {
711 if (dx || dy)
712 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
713 else
714 {
715 clear_win_info (op);
716 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
717 }
718 flag = 1;
719 }
720
721 if (QUERY_FLAG (op, FLAG_WIZ))
722 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
723 else
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
725
726 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
727 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
728 inventory (op, tmp->head == NULL ? tmp : tmp->head);
729
730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
731 break;
732 }
733
734 if (!flag)
735 {
736 if (dx || dy)
737 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
738 else
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
740 }
741}
742
743
744
745/** Client wants to look at some object. Lets do so. */
746void
747LookAt (char *buf, int len, player *pl)
748{
749 int dx, dy;
750 char *cp;
751
752 dx = atoi (buf);
753 if (!(cp = strchr (buf, ' ')))
754 {
755 return;
756 }
757 dy = atoi (cp); 759 int dy = atoi (cp);
758 760
759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
760 return;
761
762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
763 return;
764
765 look_at (pl->ob, dx, dy); 761 look_at (pl, dx, dy);
766} 762}
767 763
768/** Move an object to a new location */ 764/** Move an object to a new location */
769void 765void
770esrv_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)
771{ 767{
772 object *op, *env;
773
774 op = esrv_get_ob_from_count (pl, tag); 768 object *op = esrv_get_ob_from_count (pl, tag);
775 if (!op) 769 if (!op)
776 { 770 {
777 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);
778 return; 772 return;
779 } 773 }
… …
786 /* 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
787 * in the container and not the container itself. 781 * in the container and not the container itself.
788 */ 782 */
789 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
790 { 784 {
791 object *current, *next; 785 int cnt = MAX_ITEM_PER_ACTION;
792 786
793 for (current = op->inv; current != NULL; current = next) 787 for (object *current = op->inv; current && cnt--; )
794 { 788 {
795 next = current->below; 789 object *next = current->below;
796 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);
791 current = next;
797 } 792 }
798 793
799 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.");
800 } 796 }
801 else 797 else
802 drop_object (pl, op, nrof); 798 drop_object (pl, op, nrof);
803 799
804 return; 800 return;
… …
812 pl->contr->count = nrof; 808 pl->contr->count = nrof;
813 pick_up (pl, op); 809 pick_up (pl, op);
814 return; 810 return;
815 } 811 }
816 812
817 env = esrv_get_ob_from_count (pl, to); 813 object *env = esrv_get_ob_from_count (pl, to);
818 if (!env) 814 if (!env)
819 { 815 {
820 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);
821 return; 817 return;
822 } 818 }
… …
824 /* put_object_in_sack presumes that necessary sanity checking 820 /* put_object_in_sack presumes that necessary sanity checking
825 * 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
826 * 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
827 * 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.
828 */ 824 */
829 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 825 if (env->type == CONTAINER
826 && can_pick (pl, op)
827 && sack_can_hold (pl, env, op, nrof))
830 put_object_in_sack (pl, env, op, nrof); 828 put_object_in_sack (pl, env, op, nrof);
831} 829}
832 830

Diff Legend

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