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.83 by root, Sun Nov 8 15:11:23 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * This containes item logic for client/server. It doesn't contain 31 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 33 * the logic for what items should be sent.
33 */ 34 */
34 35
35#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); 125 ns.flush_fx ();
130 126
131 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])
132 esrv_send_animation (&ns, head->animation_id); 128 ns.send_animation (head->animation_id);
133 129
134 sl << uint32 (head->count) 130 sl << uint32 (head->count)
135 << uint32 (flags) 131 << uint32 (flags)
136 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 132 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
137 << uint32 (head->face->number); 133 << uint32 (head->face);
138 134
139 if (!head->custom_name) 135 if (!head->custom_name)
140 { 136 {
141 strncpy (item_n, query_base_name (head, 0), 127); 137 const char *name;
142 item_n[127] = 0; 138 uint8 *len = sl.cur++; // patch up length later
143 len = strlen (item_n); 139
144 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;
145 } 145 }
146 else 146 else
147 { 147 {
148 strncpy (item_n, head->custom_name, 127); 148 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 149
154 strncpy (item_n + len + 1, item_p, 127); 150 sl << uint8 (len * 2 + 1)
155 item_n[254] = 0; 151 << data (head->custom_name, len)
156 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data (head->custom_name, len);
154 }
157 155
158 sl << data8 (item_n, len)
159 << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
160 157
161 anim_speed = 0; 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
162 if (QUERY_FLAG (head, FLAG_ANIMATE)) 159 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
163 { 160 : 1. / clamp (fabs (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 161
180 sl << uint8 (anim_speed) 162 sl << uint8 (anim_speed)
181 << uint32 (head->nrof); 163 << uint32 (head->nrof);
182 164
183 if (ns.itemcmd == 2) 165 if (ns.itemcmd == 2)
184 sl << uint16 (head->client_type); 166 sl << uint16 (head->client_type);
185
186 SET_FLAG (head, FLAG_CLIENT_SENT);
187} 167}
188 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"
189 182
190/** 183/**
191 * Send the look window. Don't need to do animations here 184 * 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 185 * This sends all the faces to the client, not just updates. This is
193 * because object ordering would otherwise be inconsistent. 186 * because object ordering would otherwise be inconsistent.
194 */ 187 */
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 }
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} 366}
364 367
365/** 368/**
366 * Updates object *op for player *pl. 369 * Updates object *op for player *pl.
367 * 370 *
368 * flags is a list of values to update 371 * flags is a list of values to update
369 * 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
370 * same value both places. 373 * same value both places.
371 */ 374 */
372
373void 375void
374esrv_update_item (int flags, object *pl, object *op) 376esrv_update_item (int flags, object *pl, object *op)
375{ 377{
376 /* 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. */
377 if (op != pl) 379 if (op != pl && !op->client_visible ())
378 {
379 if (!LOOK_OBJ (op))
380 return; 380 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 381
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 382 client *ns = pl->contr->ns;
388 { 383 if (!ns)
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 384 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 385
396 packet sl; 386 packet sl ("upditem");
397 387
398 sl << "upditem "
399 << uint8 (flags); 388 sl << uint8 (flags);
400 389
401 if (op->head)
402 op = op->head; 390 op = op->head_ ();
403 391
404 sl << uint32 (op->count); 392 sl << uint32 (op->count);
405 393
406 if (flags & UPD_LOCATION) 394 if (flags & UPD_LOCATION)
407 sl << uint32 (op->env ? op->env->count : 0); 395 sl << uint32 (op->env ? op->env->count : 0);
… …
409 if (flags & UPD_FLAGS) 397 if (flags & UPD_FLAGS)
410 sl << uint32 (query_flags (op)); 398 sl << uint32 (query_flags (op));
411 399
412 if (flags & UPD_WEIGHT) 400 if (flags & UPD_WEIGHT)
413 { 401 {
414 sint32 weight = WEIGHT (op); 402 sint32 weight = op->client_weight ();
415 403
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 404 if (op == pl)
417
418 if (pl == op)
419 op->contr->last_weight = weight; 405 ns->last_weight = weight;
406
407 sl << uint32 (weight);
420 } 408 }
421 409
422 if (flags & UPD_FACE) 410 if (flags & UPD_FACE)
423 { 411 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 412 ns->send_face (op->face, -50);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 413 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 414 sl << uint32 (op->face);
428 } 415 }
429 416
430 if (flags & UPD_NAME) 417 if (flags & UPD_NAME)
431 { 418 {
432 int len; 419 int len;
433 const char *item_p; 420 const char *item_p;
434 char item_n[MAX_BUF]; 421 char item_n[127 * 2];
435 422
436 if (!op->custom_name) 423 if (!op->custom_name)
437 { 424 {
438 strncpy (item_n, query_base_name (op, 0), 127); 425 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); 426 item_p = query_base_name (op, 1);
442 } 427 }
443 else 428 else
444 { 429 {
445 strncpy (item_n, op->custom_name, 127); 430 len = assign (item_n, &op->custom_name, 127);
446 item_n[127] = 0;
447 len = strlen (item_n);
448 item_p = op->custom_name; 431 item_p = &op->custom_name;
449 } 432 }
450 433
451 strncpy (item_n + len + 1, item_p, 127); 434 len += assign (item_n + len, item_p, 127);
452 item_n[254] = 0;
453 len += strlen (item_n + 1 + len) + 1;
454 435
455 sl << data8 (item_n, len); 436 sl << data8 (item_n, len);
456 } 437 }
457 438
458 if (flags & UPD_ANIM) 439 if (flags & UPD_ANIM)
… …
466 { 447 {
467 if (op->anim_speed) 448 if (op->anim_speed)
468 anim_speed = op->anim_speed; 449 anim_speed = op->anim_speed;
469 else 450 else
470 { 451 {
471 if (FABS (op->speed) < 0.001) 452 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 453 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 454 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 455 anim_speed = 1;
475 else 456 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 457 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 458 }
478 459
479 if (anim_speed > 255) 460 if (anim_speed > 255)
480 anim_speed = 255; 461 anim_speed = 255;
481 } 462 }
… …
484 } 465 }
485 466
486 if (flags & UPD_NROF) 467 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 468 sl << uint32 (op->nrof);
488 469
489 pl->contr->socket->send_packet (sl); 470 pl->contr->ns->send_packet (sl);
490} 471}
491 472
492/** 473/**
493 * Sends item's info to player. 474 * Sends item's info to player.
494 */ 475 */
495void 476void
496esrv_send_item (object *pl, object *op) 477esrv_send_item (object *pl, object *op)
497{ 478{
498 /* If this is not the player object, do some more checks */ 479 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; 480 return;
504 /* if the item is on the ground, mark that the look needs to 481
505 * be updated. 482 /* We only send 'visible' objects to the client, and sometimes the player */
506 */ 483 if (!op->client_visible () && op->type != PLAYER)
507 if (!op->env)
508 {
509 pl->contr->socket->update_look = 1;
510 return; 484 return;
511 }
512 }
513 485
514 packet sl; 486 packet sl;
515 487
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 489
518 if (op->head)
519 op = op->head; 490 op = op->head_ ();
520 491
521 sl << uint32 (op->env ? op->env->count : 0); 492 sl << uint32 (op->env ? op->env->count : 0);
522 493
523 add_object_to_socklist (*pl->contr->socket, sl, op); 494 add_object_to_socklist (*pl->contr->ns, sl, op);
524 495
525 pl->contr->socket->send_packet (sl); 496 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 497}
528 498
529/** 499/**
530 * Tells the client to delete an item. Uses the item 500 * Tells the client to delete an item.
531 * command with a -1 location.
532 */ 501 */
533
534void 502void
535esrv_del_item (player *pl, int tag) 503esrv_del_item (player *pl, int tag)
536{ 504{
537 packet sl; 505 if (!pl->ns)
506 return;
538 507
539 sl << "delitem " 508 packet sl ("delitem");
509
540 << uint32 (tag); 510 sl << uint32 (tag);
541 511
542 pl->socket->send_packet (sl); 512 pl->ns->send_packet (sl);
543} 513}
544 514
545 515
546/******************************************************************************* 516/*******************************************************************************
547 * 517 *
… …
551 521
552/** 522/**
553 * 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
554 * pointer, or null if it can't be found. 524 * pointer, or null if it can't be found.
555 */ 525 */
556 526static object *
557object *
558esrv_get_ob_from_count (object *pl, tag_t count) 527esrv_get_ob_from_count (object *pl, tag_t count)
559{ 528{
560 object *op, *tmp;
561
562 if (pl->count == count) 529 if (pl->count == count)
563 return pl; 530 return pl;
564 531
565 for (op = pl->inv; op; op = op->below) 532 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 533 if (op->count == count)
567 return op; 534 return op;
568 else if (op->type == CONTAINER && pl->container == op) 535 else if (op->type == CONTAINER && pl->container_ () == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 536 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 537 if (tmp->count == count)
571 return tmp; 538 return tmp;
572 539
573 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)
574 if (op->head && op->head->count == count) 541 if (op->head && op->head->count == count)
575 return op; 542 return op;
576 else if (op->count == count) 543 else if (op->count == count)
577 return op; 544 return op;
578 else if (op->type == CONTAINER && pl->container == op) 545 else if (op->type == CONTAINER && pl->container_ () == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 546 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 547 if (tmp->count == count)
581 return tmp; 548 return tmp;
582 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
583 return 0; 556 return 0;
584} 557}
585 558
586
587/** Client wants to examine some object. So lets do so. */ 559/** Client wants to examine some object. So lets do so. */
588void 560void
589ExamineCmd (char *buf, int len, player *pl) 561ExamineCmd (char *buf, int len, player *pl)
590{ 562{
591 tag_t tag = atoi (buf); 563 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 564
620 /* If the high bit is set, player applied a pseudo object. */ 565 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 566 if (tag & 0x80000000)
622 { 567 {
623 pl->socket->look_position = tag & 0x7fffffff; 568 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 569 pl->ns->floorbox_update ();
625 return; 570 return;
626 } 571 }
627 572
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 573 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 574
630 if (!op) 575 if (!op)
631 { 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 {
632 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);
633 return; 621 return;
634 } 622 }
635 623
636 player_apply (pl->ob, op, 0, 0); 624 player_apply (pl->ob, op, 0, 0);
637} 625}
638 626
639/** Client wants to apply some object. Lets do so. */ 627/** Client wants to lock some object. Lets do so. */
640void 628void
641LockItem (char *data, int len, player *pl) 629LockItem (char *data, int len, player *pl)
642{ 630{
643 int flag = data[0]; 631 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 632 tag_t tag = net_uint32 ((uint8 *)data + 1);
645 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 object *op = esrv_get_ob_from_count (pl->ob, tag);
646 634
647 if (!op) 635 if (!op)
648 { 636 {
649 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");
650 return; 638 return;
651 } 639 }
652 640
653 if (!flag) 641 if (!flag)
654 CLEAR_FLAG (op, FLAG_INV_LOCKED); 642 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 644 SET_FLAG (op, FLAG_INV_LOCKED);
657 645
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 646 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 647}
660 648
661/** Client wants to apply some object. Lets do so. */ 649/** Client wants to mark some object. Lets do so. */
662void 650void
663MarkItem (char *data, int len, player *pl) 651MarkItem (char *data, int len, player *pl)
664{ 652{
665 tag_t tag = net_uint32 ((uint8 *)data); 653 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 654 object *op = esrv_get_ob_from_count (pl->ob, tag);
667 655
668 if (!op) 656 if (!op)
669 { 657 {
670 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 658 pl->failmsg ("Could not find object to mark");
671 return; 659 return;
672 } 660 }
673 661
674 pl->mark = op; 662 pl->mark = op;
675 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)));
676} 664}
677 665
678/** 666/**
679 * look_at prints items on the specified square. 667 * look_at prints items on the specified square.
680 * 668 *
681 * [ removed EARTHWALL check and added check for containers inventory. 669 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 670 * Tero.Haatanen@lut.fi ]
683 */ 671 */
684void 672static void
685look_at (object *op, int dx, int dy) 673look_at (player *pl, int dx, int dy)
686{ 674{
687 object *tmp; 675 dynbuf_text &buf = msg_dynbuf; buf.clear ();
688 int flag = 0; 676 object *ob = pl->ob;
689 sint16 x, y;
690 maptile *m;
691 677
692 x = op->x + dx; 678 if (!pl->observe->map)
693 y = op->y + dy;
694
695 if (out_of_map (op->map, x, y))
696 return; 679 return;
697 680
698 m = get_map_from_coord (op->map, &x, &y); 681 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
699 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; nrof %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.nrof (), (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).\n", query_name (tmp), tmp->count);
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, ' ')))
700 return; 749 return;
701 750
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); 751 int dy = atoi (cp);
758 752
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); 753 look_at (pl, dx, dy);
766} 754}
767 755
768/** Move an object to a new location */ 756/** Move an object to a new location */
769void 757void
770esrv_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)
771{ 759{
772 object *op, *env;
773
774 op = esrv_get_ob_from_count (pl, tag); 760 object *op = esrv_get_ob_from_count (pl, tag);
775 if (!op) 761 if (!op)
776 { 762 {
777 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);
778 return; 764 return;
779 } 765 }
… …
786 /* 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
787 * in the container and not the container itself. 773 * in the container and not the container itself.
788 */ 774 */
789 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 775 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
790 { 776 {
791 object *current, *next; 777 int cnt = MAX_ITEM_PER_DROP;
792 778
793 for (current = op->inv; current != NULL; current = next) 779 for (object *current = op->inv; current && cnt--; )
794 { 780 {
795 next = current->below; 781 object *next = current->below;
796 drop_object (pl, current, 0); 782 drop_object (pl, current, 0);
783 current = next;
797 } 784 }
798 785
799 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.");
800 } 788 }
801 else 789 else
802 drop_object (pl, op, nrof); 790 drop_object (pl, op, nrof);
803 791
804 return; 792 return;
… …
812 pl->contr->count = nrof; 800 pl->contr->count = nrof;
813 pick_up (pl, op); 801 pick_up (pl, op);
814 return; 802 return;
815 } 803 }
816 804
817 env = esrv_get_ob_from_count (pl, to); 805 object *env = esrv_get_ob_from_count (pl, to);
818 if (!env) 806 if (!env)
819 { 807 {
820 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);
821 return; 809 return;
822 } 810 }
… …
824 /* put_object_in_sack presumes that necessary sanity checking 812 /* put_object_in_sack presumes that necessary sanity checking
825 * 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
826 * 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
827 * 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.
828 */ 816 */
829 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 817 if (env->type == CONTAINER
818 && can_pick (pl, op)
819 && sack_can_hold (pl, env, op, nrof))
830 put_object_in_sack (pl, env, op, nrof); 820 put_object_in_sack (pl, env, op, nrof);
831} 821}
832 822

Diff Legend

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