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

Diff Legend

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