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.23 by root, Fri Dec 15 19:59:20 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 */ 37#include <object.h>
38#include <sproto.h> 38#include <sproto.h>
39 39
40/** 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 */
41#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42 42
46 * 46 *
47 ******************************************************************************/ 47 ******************************************************************************/
48 48
49/** 49/**
50 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
51 * to be sended to client. 51 * to be sent to client.
52 */ 52 */
53unsigned int 53static unsigned int
54query_flags (object *op) 54query_flags (object *op)
55{ 55{
56 unsigned int flags = 0; 56 unsigned int flags = 0;
57 57
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (QUERY_FLAG (op, FLAG_APPLIED))
59 {
60 switch (op->type) 59 switch (op->type)
61 { 60 {
62 case BOW: 61 case BOW:
63 case WAND: 62 case WAND:
64 case ROD: 63 case ROD:
65 case HORN: 64 case HORN:
66 flags = a_readied; 65 flags = a_readied;
67 break; 66 break;
68 case WEAPON: 67 case WEAPON:
69 flags = a_wielded; 68 flags = a_wielded;
70 break; 69 break;
71 case SKILL: 70 case SKILL:
72 case ARMOUR: 71 case ARMOUR:
73 case HELMET: 72 case HELMET:
74 case SHIELD: 73 case SHIELD:
75 case RING: 74 case RING:
76 case BOOTS: 75 case BOOTS:
77 case GLOVES: 76 case GLOVES:
78 case AMULET: 77 case AMULET:
79 case GIRDLE: 78 case GIRDLE:
80 case BRACERS: 79 case BRACERS:
81 case CLOAK: 80 case CLOAK:
82 flags = a_worn; 81 flags = a_worn;
83 break; 82 break;
84 case CONTAINER: 83 case CONTAINER:
85 flags = a_active; 84 flags = a_active;
86 break; 85 break;
87 default: 86 default:
88 flags = a_applied; 87 flags = a_applied;
89 break; 88 break;
90 } 89 }
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))
98 flags |= F_DAMNED; 97 flags |= F_DAMNED;
99 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (QUERY_FLAG (op, FLAG_CURSED))
100 flags |= F_CURSED; 99 flags |= F_CURSED;
101 } 100 }
101
102 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))
103 flags |= F_MAGIC; 103 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (QUERY_FLAG (op, FLAG_UNPAID))
105 flags |= F_UNPAID; 105 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
114 * animation of face to the client. 114 * animation of face to the client.
115 */ 115 */
116static void 116static void
117add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
118{ 118{
119 int flags, len, anim_speed;
120 char item_n[MAX_BUF];
121 const char *item_p;
122
123 flags = query_flags (head); 119 int flags = query_flags (head);
120
124 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (QUERY_FLAG (head, FLAG_NO_PICK))
125 flags |= F_NOPICK; 122 flags |= F_NOPICK;
126 123
127 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 124 ns.send_face (head->face, -50);
128 esrv_send_face (&ns, head->face->number, 0);
129 125
130 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])
131 esrv_send_animation (&ns, head->animation_id); 127 ns.send_animation (head->animation_id);
132 128
133 sl << uint32 (head->count) 129 sl << uint32 (head->count)
134 << uint32 (flags) 130 << uint32 (flags)
135 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 131 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
136 << uint32 (head->face->number); 132 << uint32 (head->face);
137 133
138 if (!head->custom_name) 134 if (!head->custom_name)
139 { 135 {
140 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
141 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
142 len = strlen (item_n); 138
143 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;
144 } 144 }
145 else 145 else
146 { 146 {
147 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
148 item_n[127] = 0;
149 len = strlen (item_n);
150 item_p = head->custom_name;
151 }
152 148
153 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
154 item_n[254] = 0; 150 << data (head->custom_name, len)
155 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
156 154
157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
159 156
160 anim_speed = 0; 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 if (QUERY_FLAG (head, FLAG_ANIMATE)) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 { 159 : 1. / clamp (head->speed, 1./255., 1./1.);
163 if (head->anim_speed)
164 anim_speed = head->anim_speed;
165 else
166 {
167 if (FABS (head->speed) < 0.001)
168 anim_speed = 255;
169 else if (FABS (head->speed) >= 1.0)
170 anim_speed = 1;
171 else
172 anim_speed = (int) (1.0 / FABS (head->speed));
173 }
174
175 if (anim_speed > 255)
176 anim_speed = 255;
177 }
178 160
179 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
180 << uint32 (head->nrof); 162 << uint32 (head->nrof);
181 163
182 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
183 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
184
185 SET_FLAG (head, FLAG_CLIENT_SENT);
186} 166}
187 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"
188 181
189/** 182/**
190 * Send the look window. Don't need to do animations here 183 * Send the look window. Don't need to do animations here
191 * 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
192 * because object ordering would otherwise be inconsistent 185 * because object ordering would otherwise be inconsistent.
193 */ 186 */
194
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 } /* If LOOK_OBJ() */
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);
363 372 }
364} 373}
365 374
366/** 375/**
367 * Updates object *op for player *pl. 376 * Updates object *op for player *pl.
368 * 377 *
369 * flags is a list of values to update 378 * flags is a list of values to update
370 * 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
371 * same value both places. 380 * same value both places.
372 */ 381 */
373
374void 382void
375esrv_update_item (int flags, object *pl, object *op) 383esrv_update_item (int flags, object *pl, object *op)
376{ 384{
377 /* 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. */
378 if (op != pl) 386 if (op != pl && !op->client_visible ())
379 {
380 if (!LOOK_OBJ (op))
381 return; 387 return;
382 /* we remove the check for op->env, because in theory, the object
383 * is hopefully in the same place, so the client should preserve
384 * order.
385 */
386 }
387 388
388 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 389 client *ns = pl->contr->ns;
389 { 390 if (!ns)
390 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 return;
391 * this is happening - we can set a breakpoint here in the debugger
392 * and track back the call.
393 */
394 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
395 }
396 392
397 packet sl; 393 packet sl ("upditem");
398 394
399 sl << "upditem "
400 << uint8 (flags); 395 sl << uint8 (flags);
401 396
402 if (op->head)
403 op = op->head; 397 op = op->head_ ();
404 398
405 sl << uint32 (op->count); 399 sl << uint32 (op->count);
406 400
407 if (flags & UPD_LOCATION) 401 if (flags & UPD_LOCATION)
408 sl << uint32 (op->env ? op->env->count : 0); 402 sl << uint32 (op->env ? op->env->count : 0);
410 if (flags & UPD_FLAGS) 404 if (flags & UPD_FLAGS)
411 sl << uint32 (query_flags (op)); 405 sl << uint32 (query_flags (op));
412 406
413 if (flags & UPD_WEIGHT) 407 if (flags & UPD_WEIGHT)
414 { 408 {
415 sint32 weight = WEIGHT (op); 409 sint32 weight = op->client_weight ();
416 410
417 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 411 if (op == pl)
418
419 if (pl == op)
420 op->contr->last_weight = weight; 412 ns->last_weight = weight;
413
414 sl << uint32 (weight);
421 } 415 }
422 416
423 if (flags & UPD_FACE) 417 if (flags & UPD_FACE)
424 { 418 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 419 ns->send_face (op->face, -50);
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 420 ns->flush_fx ();
427
428 sl << uint32 (op->face->number); 421 sl << uint32 (op->face);
429 } 422 }
430 423
431 if (flags & UPD_NAME) 424 if (flags & UPD_NAME)
432 { 425 {
433 int len; 426 int len;
434 const char *item_p; 427 const char *item_p;
435 char item_n[MAX_BUF]; 428 char item_n[127 * 2];
436 429
437 if (!op->custom_name) 430 if (!op->custom_name)
438 { 431 {
439 strncpy (item_n, query_base_name (op, 0), 127); 432 len = assign (item_n, query_base_name (op, 0), 127);
440 item_n[127] = 0;
441 len = strlen (item_n);
442 item_p = query_base_name (op, 1); 433 item_p = query_base_name (op, 1);
443 } 434 }
444 else 435 else
445 { 436 {
446 strncpy (item_n, op->custom_name, 127); 437 len = assign (item_n, &op->custom_name, 127);
447 item_n[127] = 0;
448 len = strlen (item_n);
449 item_p = op->custom_name; 438 item_p = &op->custom_name;
450 } 439 }
451 440
452 strncpy (item_n + len + 1, item_p, 127); 441 len += assign (item_n + len, item_p, 127);
453 item_n[254] = 0;
454 len += strlen (item_n + 1 + len) + 1;
455 442
456 sl << data8 (item_n, len); 443 sl << data8 (item_n, len);
457 } 444 }
458 445
459 if (flags & UPD_ANIM) 446 if (flags & UPD_ANIM)
467 { 454 {
468 if (op->anim_speed) 455 if (op->anim_speed)
469 anim_speed = op->anim_speed; 456 anim_speed = op->anim_speed;
470 else 457 else
471 { 458 {
472 if (FABS (op->speed) < 0.001) 459 if (op->speed < 0.001)
473 anim_speed = 255; 460 anim_speed = 255;
474 else if (FABS (op->speed) >= 1.0) 461 else if (op->speed >= 1.0)
475 anim_speed = 1; 462 anim_speed = 1;
476 else 463 else
477 anim_speed = (int) (1.0 / FABS (op->speed)); 464 anim_speed = 1. / op->speed;
478 } 465 }
479 466
480 if (anim_speed > 255) 467 if (anim_speed > 255)
481 anim_speed = 255; 468 anim_speed = 255;
482 } 469 }
485 } 472 }
486 473
487 if (flags & UPD_NROF) 474 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 475 sl << uint32 (op->nrof);
489 476
490 pl->contr->socket->send_packet (sl); 477 pl->contr->ns->send_packet (sl);
491} 478}
492 479
493/** 480/**
494 * Sends item's info to player. 481 * Sends item's info to player.
495 */ 482 */
496void 483void
497esrv_send_item (object *pl, object *op) 484esrv_send_item (object *pl, object *op)
498{ 485{
499 /* If this is not the player object, do some more checks */ 486 if (!pl->contr->ns)
500 if (op != pl)
501 {
502 /* We only send 'visibile' objects to the client */
503 if (!LOOK_OBJ (op))
504 return; 487 return;
505 /* if the item is on the ground, mark that the look needs to 488
506 * be updated. 489 /* We only send 'visible' objects to the client, and sometimes the player */
507 */ 490 if (!op->client_visible () && op->type != PLAYER)
508 if (!op->env)
509 {
510 pl->contr->socket->update_look = 1;
511 return; 491 return;
512 }
513 }
514 492
515 packet sl; 493 packet sl;
516 494
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 495 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 496
519 if (op->head)
520 op = op->head; 497 op = op->head_ ();
521 498
522 sl << uint32 (op->env ? op->env->count : 0); 499 sl << uint32 (op->env ? op->env->count : 0);
523 500
524 add_object_to_socklist (*pl->contr->socket, sl, op); 501 add_object_to_socklist (*pl->contr->ns, sl, op);
525 502
503 pl->contr->ns->flush_fx ();
526 pl->contr->socket->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 505}
530 506
531/** 507/**
532 * Tells the client to delete an item. Uses the item 508 * Tells the client to delete an item.
533 * command with a -1 location.
534 */ 509 */
535
536void 510void
537esrv_del_item (player *pl, int tag) 511esrv_del_item (player *pl, int tag)
538{ 512{
539 packet sl; 513 if (!pl->ns)
514 return;
540 515
541 sl << "delitem " 516 packet sl ("delitem");
517
542 << uint32 (tag); 518 sl << uint32 (tag);
543 519
544 pl->socket->send_packet (sl); 520 pl->ns->send_packet (sl);
545} 521}
546 522
547 523
548/******************************************************************************* 524/*******************************************************************************
549 * 525 *
553 529
554/** 530/**
555 * 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
556 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
557 */ 533 */
558 534static object *
559object *
560esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
561{ 536{
562 object *op, *tmp;
563
564 if (pl->count == count) 537 if (pl->count == count)
565 return pl; 538 return pl;
566 539
567 for (op = pl->inv; op; op = op->below) 540 for (object *op = pl->inv; op; op = op->below)
568 if (op->count == count) 541 if (op->count == count)
569 return op; 542 return op;
570 else if (op->type == CONTAINER && pl->container == op) 543 else if (op->type == CONTAINER && pl->container_ () == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 544 for (object *tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 545 if (tmp->count == count)
573 return tmp; 546 return tmp;
574 547
575 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)
576 if (op->head != NULL && op->head->count == count) 549 if (op->head && op->head->count == count)
577 return op; 550 return op;
578 else if (op->count == count) 551 else if (op->count == count)
579 return op; 552 return op;
580 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container_ () == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 555 if (tmp->count == count)
583 return tmp; 556 return tmp;
584 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
585 return NULL; 564 return 0;
586} 565}
587
588 566
589/** Client wants to examine some object. So lets do so. */ 567/** Client wants to examine some object. So lets do so. */
590void 568void
591ExamineCmd (char *buf, int len, player *pl) 569ExamineCmd (char *buf, int len, player *pl)
592{ 570{
593 tag_t tag = atoi (buf); 571 tag_t tag = atoi (buf);
594
595 /* If the high bit is set, player examined a pseudo object. */
596 if (tag & 0x80000000)
597 return;
598
599 object *op = esrv_get_ob_from_count (pl->ob, tag);
600
601 if (!op)
602 {
603 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
604 return;
605 }
606
607 examine (pl->ob, op);
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 /* sort of a hack, but if the player saves and the player then manually
617 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
618 */
619 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
620 return;
621 572
622 /* If the high bit is set, player applied a pseudo object. */ 573 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 574 if (tag & 0x80000000)
624 { 575 {
625 pl->socket->look_position = tag & 0x7fffffff; 576 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 577 pl->ns->floorbox_update ();
627 return; 578 return;
628 } 579 }
629 580
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 581 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 582
632 if (!op) 583 if (!op)
633 { 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 {
634 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);
635 return; 629 return;
636 } 630 }
637 631
638 player_apply (pl->ob, op, 0, 0); 632 pl->ob->apply (op, AP_TOGGLE);
639} 633}
640 634
641/** Client wants to apply some object. Lets do so. */ 635/** Client wants to lock some object. Lets do so. */
642void 636void
643LockItem (char *data, int len, player *pl) 637LockItem (char *data, int len, player *pl)
644{ 638{
645 int flag = data[0]; 639 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 640 tag_t tag = net_uint32 ((uint8 *)data + 1);
647 object *op = esrv_get_ob_from_count (pl->ob, tag); 641 object *op = esrv_get_ob_from_count (pl->ob, tag);
648 642
649 if (!op) 643 if (!op)
650 { 644 {
651 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");
652 return; 646 return;
653 } 647 }
654 648
655 if (!flag) 649 if (!flag)
656 CLEAR_FLAG (op, FLAG_INV_LOCKED); 650 CLEAR_FLAG (op, FLAG_INV_LOCKED);
658 SET_FLAG (op, FLAG_INV_LOCKED); 652 SET_FLAG (op, FLAG_INV_LOCKED);
659 653
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 654 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 655}
662 656
663/** Client wants to apply some object. Lets do so. */ 657/** Client wants to mark some object. Lets do so. */
664void 658void
665MarkItem (char *data, int len, player *pl) 659MarkItem (char *data, int len, player *pl)
666{ 660{
667 tag_t tag = net_uint32 ((uint8 *)data); 661 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 662 object *op = esrv_get_ob_from_count (pl->ob, tag);
669 663
670 if (!op) 664 if (!op)
671 { 665 {
672 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 666 pl->failmsg ("Could not find object to mark");
673 return; 667 return;
674 } 668 }
675 669
676 pl->mark = op; 670 pl->mark = op;
677 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)));
678} 672}
679 673
680/** 674/**
681 * look_at prints items on the specified square. 675 * look_at prints items on the specified square.
682 * 676 *
683 * [ removed EARTHWALL check and added check for containers inventory. 677 * [ removed EARTHWALL check and added check for containers inventory.
684 * Tero.Haatanen@lut.fi ] 678 * Tero.Haatanen@lut.fi ]
685 */ 679 */
686void 680static void
687look_at (object *op, int dx, int dy) 681look_at (player *pl, int dx, int dy)
688{ 682{
689 object *tmp; 683 dynbuf_text &buf = msg_dynbuf; buf.clear ();
690 int flag = 0; 684 object *ob = pl->ob;
691 sint16 x, y;
692 maptile *m;
693 685
694 x = op->x + dx; 686 if (!pl->observe->map)
695 y = op->y + dy;
696
697 if (out_of_map (op->map, x, y))
698 return; 687 return;
699 688
700 m = get_map_from_coord (op->map, &x, &y); 689 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
701 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, ' ')))
702 return; 757 return;
703 758
704 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
705
706 for (; tmp != NULL; tmp = tmp->below)
707 {
708 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
709 continue;
710
711 if (!flag)
712 {
713 if (dx || dy)
714 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
715 else
716 {
717 clear_win_info (op);
718 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
719 }
720 flag = 1;
721 }
722
723 if (QUERY_FLAG (op, FLAG_WIZ))
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
725 else
726 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
727
728 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
729 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
730 inventory (op, tmp->head == NULL ? tmp : tmp->head);
731
732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
733 break;
734 }
735
736 if (!flag)
737 {
738 if (dx || dy)
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
740 else
741 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
742 }
743}
744
745
746
747/** Client wants to look at some object. Lets do so. */
748void
749LookAt (char *buf, int len, player *pl)
750{
751 int dx, dy;
752 char *cp;
753
754 dx = atoi (buf);
755 if (!(cp = strchr (buf, ' ')))
756 {
757 return;
758 }
759 dy = atoi (cp); 759 int dy = atoi (cp);
760 760
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
762 return;
763
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
765 return;
766
767 look_at (pl->ob, dx, dy); 761 look_at (pl, dx, dy);
768} 762}
769 763
770/** Move an object to a new location */ 764/** Move an object to a new location */
771void 765void
772esrv_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)
773{ 767{
774 object *op, *env;
775
776 op = esrv_get_ob_from_count (pl, tag); 768 object *op = esrv_get_ob_from_count (pl, tag);
777 if (!op) 769 if (!op)
778 { 770 {
779 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);
780 return; 772 return;
781 } 773 }
788 /* 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
789 * in the container and not the container itself. 781 * in the container and not the container itself.
790 */ 782 */
791 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
792 { 784 {
793 object *current, *next; 785 int cnt = MAX_ITEM_PER_ACTION;
794 786
795 for (current = op->inv; current != NULL; current = next) 787 for (object *current = op->inv; current && cnt--; )
796 { 788 {
797 next = current->below; 789 object *next = current->below;
798 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);
791 current = next;
799 } 792 }
800 793
801 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.");
802 } 796 }
803 else 797 else
804 {
805 drop_object (pl, op, nrof); 798 drop_object (pl, op, nrof);
806 } 799
807 return; 800 return;
808 } 801 }
809 else if (to == pl->count) 802 else if (to == pl->count)
810 { /* pick it up to the inventory */ 803 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 804 /* return if player has already picked it up */
815 pl->contr->count = nrof; 808 pl->contr->count = nrof;
816 pick_up (pl, op); 809 pick_up (pl, op);
817 return; 810 return;
818 } 811 }
819 812
820 env = esrv_get_ob_from_count (pl, to); 813 object *env = esrv_get_ob_from_count (pl, to);
821 if (!env) 814 if (!env)
822 { 815 {
823 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);
824 return; 817 return;
825 } 818 }
827 /* put_object_in_sack presumes that necessary sanity checking 820 /* put_object_in_sack presumes that necessary sanity checking
828 * 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
829 * 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
830 * 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.
831 */ 824 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 825 if (env->type == CONTAINER
833 { 826 && can_pick (pl, op)
827 && sack_can_hold (pl, env, op, nrof))
834 put_object_in_sack (pl, env, op, nrof); 828 put_object_in_sack (pl, env, op, nrof);
835 }
836} 829}
837 830

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines