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.27 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.93 by root, Sun Apr 11 23:32:10 2010 UTC

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

Diff Legend

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