[ViewVC] Diff of: cvs/deliantra/server/socket/item.C

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.59 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC

…		…
193	query_flags (object *op)	193	query_flags (object *op)
194	{	194	{
195	unsigned int flags = 0;	195	unsigned int flags = 0;
196		196
197	if (QUERY_FLAG (op, FLAG_APPLIED))	197	if (QUERY_FLAG (op, FLAG_APPLIED))
198	{
199	switch (op->type)	198	switch (op->type)
200	{	199	{
201	case BOW:	200	case BOW:
202	case WAND:	201	case WAND:
203	case ROD:	202	case ROD:
204	case HORN:	203	case HORN:
205	flags = a_readied;	204	flags = a_readied;
206	break;	205	break;
207	case WEAPON:	206	case WEAPON:
208	flags = a_wielded;	207	flags = a_wielded;
209	break;	208	break;
210	case SKILL:	209	case SKILL:
211	case ARMOUR:	210	case ARMOUR:
212	case HELMET:	211	case HELMET:
213	case SHIELD:	212	case SHIELD:
214	case RING:	213	case RING:
215	case BOOTS:	214	case BOOTS:
216	case GLOVES:	215	case GLOVES:
217	case AMULET:	216	case AMULET:
218	case GIRDLE:	217	case GIRDLE:
219	case BRACERS:	218	case BRACERS:
220	case CLOAK:	219	case CLOAK:
221	flags = a_worn;	220	flags = a_worn;
222	break;	221	break;
223	case CONTAINER:	222	case CONTAINER:
224	flags = a_active;	223	flags = a_active;
225	break;	224	break;
226	default:	225	default:
227	flags = a_applied;	226	flags = a_applied;
228	break;	227	break;
229	}	228	}
230	}
231		229
232	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	230	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
233	flags \|= F_OPEN;	231	flags \|= F_OPEN;
234		232
235	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	233	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
…		…
255	* animation of face to the client.	253	* animation of face to the client.
256	*/	254	*/
257	static void	255	static void
258	add_object_to_socklist (client &ns, packet &sl, object *head)	256	add_object_to_socklist (client &ns, packet &sl, object *head)
259	{	257	{
260	int flags, len, anim_speed;
261	char item_n[MAX_BUF];	258	char item_n[MAX_BUF];
262	const char *item_p;	259	const char *item_p;
263		260
264	flags = query_flags (head);	261	int flags = query_flags (head);
265	if (QUERY_FLAG (head, FLAG_NO_PICK))	262	if (QUERY_FLAG (head, FLAG_NO_PICK))
266	flags \|= F_NOPICK;	263	flags \|= F_NOPICK;
267		264
268	ns.send_face (head->face, -50);	265	ns.send_face (head->face, -50);
269	ns.flush_fx ();	266	ns.flush_fx ();
…		…
271	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])	268	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272	ns.send_animation (head->animation_id);	269	ns.send_animation (head->animation_id);
273		270
274	sl << uint32 (head->count)	271	sl << uint32 (head->count)
275	<< uint32 (flags)	272	<< uint32 (flags)
276	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	273	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277	<< uint32 (head->face);	274	<< uint32 (head->face);
		275
		276	int len;
278		277
279	if (!head->custom_name)	278	if (!head->custom_name)
280	{	279	{
281	strncpy (item_n, query_base_name (head, 0), 127);	280	strncpy (item_n, query_base_name (head, 0), 127);
282	item_n[127] = 0;	281	item_n[127] = 0;
…		…
296	len += strlen (item_n + 1 + len) + 1;	295	len += strlen (item_n + 1 + len) + 1;
297		296
298	sl << data8 (item_n, len)	297	sl << data8 (item_n, len)
299	<< uint16 (head->animation_id);	298	<< uint16 (head->animation_id);
300		299
301	anim_speed = 0;	300	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302	if (QUERY_FLAG (head, FLAG_ANIMATE))	301	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
303	{	302	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
304	if (head->anim_speed)
305	anim_speed = head->anim_speed;
306	else
307	{
308	if (fabs (head->speed) < 0.001)
309	anim_speed = 255;
310	else if (fabs (head->speed) >= 1.0)
311	anim_speed = 1;
312	else
313	anim_speed = (int) (1.0 / fabs (head->speed));
314	}
315
316	if (anim_speed > 255)
317	anim_speed = 255;
318	}
319		303
320	sl << uint8 (anim_speed)	304	sl << uint8 (anim_speed)
321	<< uint32 (head->nrof);	305	<< uint32 (head->nrof);
322		306
323	if (ns.itemcmd == 2)	307	if (ns.itemcmd == 2)
324	sl << uint16 (head->client_type);	308	sl << uint16 (head->client_type);
325		309
326	SET_FLAG (head, FLAG_CLIENT_SENT);	310	SET_FLAG (head, FLAG_CLIENT_SENT);
327	}	311	}
		312
		313	static faceidx
		314	need_face_now (player pl, const char name)
		315	{
		316	faceidx face = face_find (name, empty_face);
		317
		318	pl->ns->send_face (face, -50);
		319	pl->ns->flush_fx ();
		320
		321	return face;
		322	}
		323
		324	#define FINGER_UP "finger_up.x11"
		325	#define FINGER_DOWN "finger_down.x11"
328		326
329	/**	327	/**
330	* Send the look window. Don't need to do animations here	328	* Send the look window. Don't need to do animations here
331	* This sends all the faces to the client, not just updates. This is	329	* This sends all the faces to the client, not just updates. This is
332	* because object ordering would otherwise be inconsistent.	330	* because object ordering would otherwise be inconsistent.
333	*/	331	*/
334	void	332	void
335	esrv_draw_look (player *pl)	333	esrv_draw_look (player *pl)
336	{	334	{
337	int got_one = 0, start_look = 0, end_look = 0;
338
339	object *ob = pl->ob;	335	object *ob = pl->ob;
340		336
341	if (!pl->ns->update_look)	337	if (!pl->ns->update_look)
342	{	338	{
343	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);	339	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344	return;	340	return;
345	}	341	}
346	else	342
347	pl->ns->update_look = 0;	343	pl->ns->update_look = 0;
348		344
349	if (QUERY_FLAG (ob, FLAG_REMOVED)	345	if (QUERY_FLAG (ob, FLAG_REMOVED)
350	\|\| !ob->map	346	\|\| !ob->map
351	\|\| ob->map->in_memory != MAP_ACTIVE	347	\|\| ob->map->in_memory != MAP_ACTIVE
352	\|\| out_of_map (ob->map, ob->x, ob->y))	348	\|\| out_of_map (ob->map, ob->x, ob->y))
…		…
357	packet sl;	353	packet sl;
358	sl.printf ("item%d ", pl->ns->itemcmd);	354	sl.printf ("item%d ", pl->ns->itemcmd);
359		355
360	sl << uint32 (0);	356	sl << uint32 (0);
361		357
362	pl->ns->send_face (empty_face, -50);	358	int start_pos = pl->ns->look_position;
363	pl->ns->flush_fx ();	359	bool dirty = false;
364		360
365	if (pl->ns->look_position)	361	mapspace &ms = ob->ms ();
		362
		363	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		364	// start from the top
		365	object *items [FLOORBOX_PAGESIZE];
		366	int item_idx = 0, item_cnt = 0;
		367	int pos = 0;
		368
		369	// find our items by walking down
		370	object *item = ms.top;
		371
		372	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		373	{
		374	if (!item->client_visible ())
		375	continue;
		376
		377	if (++pos < start_pos)
		378	continue;
		379
		380	// record item
		381	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		382	item_cnt++;
		383
		384	// stop at first floor
		385	if (item->flag [FLAG_IS_FLOOR])
		386	{
		387	// we are finished, don't append "next group of items"
		388	// by setting item to ms.bot it becomes zero which is checked after the while loop
		389	item = ms.bot;
		390	}
366	{	391	}
367	char buf[80];
368	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369		392
		393	// see if there are more if we cared - we ignore invisible objects
		394	if (item)
		395	{
		396	/* What we basically do is make a 'fake' object - when the user applies it,
		397	* we notice the special tag the object has, and act accordingly.
		398	*/
370	sl << uint32 (0x80000000 \| (pl->ns->look_position - FLOORBOX_PAGESIZE))	399	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
371	<< uint32 (0)	400	<< uint32 (0)
372	<< sint32 (-1)	401	<< uint32 ((uint32) - 1)
373	<< uint32 (empty_face)	402	<< uint32 (need_face_now (pl, FINGER_DOWN))
374	<< data8 (buf)	403	<< data8 ("Apply this to see the items below")
375	<< uint16 (0)	404	<< uint16 (0)
376	<< uint8 (0)	405	<< uint8 (0)
377	<< uint32 (0);	406	<< uint32 (0);
378		407
379	if (pl->ns->itemcmd == 2)	408	if (pl->ns->itemcmd == 2)
380	sl << uint16 (0);	409	sl << uint16 (0);
381	}
382		410
383	object *tmp = ob->ms ().top;	411	dirty = true;
384	for (object *last = 0; tmp != last; tmp = tmp->below)
385	{	412	}
386	object *head;
387		413
388	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	414	// now send out all items in the ring buffer in reverse order
		415	while (item_cnt)
		416	{
		417	--item_cnt;
		418	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		419	object *item = items [item_idx];
		420
		421	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		422
		423	dirty = true;
		424
		425	// if packet got too large, send it and begin a new one
		426	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389	{	427	{
390	last = tmp->below; /* assumes double floor mode */	428	pl->ns->send_packet (sl);
391	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	429
392	last = last->below;	430	sl.reset ();
		431	sl.printf ("item%d ", pl->ns->itemcmd);
		432	sl << uint32 (0);
		433
		434	dirty = false;
393	}	435	}
394
395	if (tmp->client_visible ())
396	{
397	if (++start_look < pl->ns->look_position)
398	continue;
399
400	end_look++;
401
402	if (end_look > FLOORBOX_PAGESIZE)
403	{
404	/* What we basically do is make a 'fake' object - when the user applies it,
405	* we notice the special tag the object has, and act accordingly.
406	*/
407	sl << uint32 (0x80000000 \| (pl->ns->look_position + FLOORBOX_PAGESIZE))
408	<< uint32 (0)
409	<< uint32 ((uint32) - 1)
410	<< uint32 (empty_face)
411	<< data8 ("Apply this to see next group of items")
412	<< uint16 (0)
413	<< uint8 (0)
414	<< uint32 (0);
415
416	if (pl->ns->itemcmd == 2)
417	sl << uint16 (0);
418
419	break;
420	}
421
422	if (tmp->head)
423	head = tmp->head;
424	else
425	head = tmp;
426
427	add_object_to_socklist (*pl->ns, sl, head);
428	got_one++;
429
430	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
431	{
432	pl->ns->send_packet (sl);
433
434	sl.reset ();
435	sl.printf ("item%d ", pl->ns->itemcmd);
436	sl << uint32 (0);
437	got_one = 0;
438	}
439	}
440	}	436	}
441		437
442	if (got_one)	438	if (start_pos)
		439	{
		440	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
		441	<< uint32 (0)
		442	<< sint32 (-1)
		443	<< uint32 (need_face_now (pl, FINGER_UP))
		444	<< data8 ("Apply this to see the items higher up")
		445	<< uint16 (0)
		446	<< uint8 (0)
		447	<< uint32 (0);
		448
		449	if (pl->ns->itemcmd == 2)
		450	sl << uint16 (0);
		451
		452	dirty = true;
		453	}
		454
		455	if (dirty)
443	pl->ns->send_packet (sl);	456	pl->ns->send_packet (sl);
444
445	}	457	}
446		458
447	/**	459	/**
448	* Sends whole inventory.	460	* Sends whole inventory.
449	*/	461	*/
…		…
506	*/	518	*/
507	void	519	void
508	esrv_update_item (int flags, object pl, object op)	520	esrv_update_item (int flags, object pl, object op)
509	{	521	{
510	/* If we have a request to send the player item, skip a few checks. */	522	/* If we have a request to send the player item, skip a few checks. */
511	if (op != pl)
512	{
513	if (!op->client_visible ())	523	if (op != pl && !op->client_visible ())
514	return;	524	return;
515	/* we remove the check for op->env, because in theory, the object
516	* is hopefully in the same place, so the client should preserve
517	* order.
518	*/
519	}
520		525
521	client *ns = pl->contr->ns;	526	client *ns = pl->contr->ns;
522	if (!ns)	527	if (!ns)
523	return;	528	return;
524		529
…		…
533		538
534	packet sl ("upditem");	539	packet sl ("upditem");
535		540
536	sl << uint8 (flags);	541	sl << uint8 (flags);
537		542
538	if (op->head)
539	op = op->head;	543	op = op->head_ ();
540		544
541	sl << uint32 (op->count);	545	sl << uint32 (op->count);
542		546
543	if (flags & UPD_LOCATION)	547	if (flags & UPD_LOCATION)
544	sl << uint32 (op->env ? op->env->count : 0);	548	sl << uint32 (op->env ? op->env->count : 0);
…		…
546	if (flags & UPD_FLAGS)	550	if (flags & UPD_FLAGS)
547	sl << uint32 (query_flags (op));	551	sl << uint32 (query_flags (op));
548		552
549	if (flags & UPD_WEIGHT)	553	if (flags & UPD_WEIGHT)
550	{	554	{
551	sint32 weight = WEIGHT (op);	555	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
552		556
553	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554
555	if (pl == op)	557	if (op)
556	ns->last_weight = weight;	558	ns->last_weight = weight;
		559
		560	sl << uint32 (weight);
557	}	561	}
558		562
559	if (flags & UPD_FACE)	563	if (flags & UPD_FACE)
560	{	564	{
561	ns->send_face (op->face, -50);	565	ns->send_face (op->face, -50);
…		…
632	esrv_send_item (object pl, object op)	636	esrv_send_item (object pl, object op)
633	{	637	{
634	if (!pl->contr->ns)	638	if (!pl->contr->ns)
635	return;	639	return;
636		640
637	/* If this is not the player object, do some more checks */
638	if (op != pl)
639	{
640	/* We only send 'visibile' objects to the client */	641	/* We only send 'visible' objects to the client, and sometimes the player */
641	if (!op->client_visible ())	642	if (!op->client_visible () && op->type != PLAYER)
642	return;	643	return;
643
644	/* if the item is on the ground, mark that the look needs to
645	* be updated.
646	*/
647	if (!op->env)
648	{
649	pl->contr->ns->floorbox_update ();
650	return;
651	}
652	}
653		644
654	packet sl;	645	packet sl;
655		646
656	sl.printf ("item%d ", pl->contr->ns->itemcmd);	647	sl.printf ("item%d ", pl->contr->ns->itemcmd);
657		648
658	if (op->head)
659	op = op->head;	649	op = op->head_ ();
660		650
661	sl << uint32 (op->env ? op->env->count : 0);	651	sl << uint32 (op->env ? op->env->count : 0);
662		652
663	add_object_to_socklist (*pl->contr->ns, sl, op);	653	add_object_to_socklist (*pl->contr->ns, sl, op);
664		654
…		…
730	void	720	void
731	ExamineCmd (char buf, int len, player pl)	721	ExamineCmd (char buf, int len, player pl)
732	{	722	{
733	tag_t tag = atoi (buf);	723	tag_t tag = atoi (buf);
734		724
		725	/* If the high bit is set, player applied a pseudo object. */
		726	if (tag & 0x80000000)
		727	{
		728	pl->ns->look_position = tag & 0x7fffffff;
		729	pl->ns->floorbox_update ();
		730	return;
		731	}
		732
735	object *op = esrv_get_ob_from_count (pl->ob, tag);	733	object *op = esrv_get_ob_from_count (pl->ob, tag);
736		734
737	if (!op)	735	if (!op)
738	{	736	{
739	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);	737	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
…		…
763	/** Client wants to apply some object. Lets do so. */	761	/** Client wants to apply some object. Lets do so. */
764	void	762	void
765	ApplyCmd (char buf, int len, player pl)	763	ApplyCmd (char buf, int len, player pl)
766	{	764	{
767	tag_t tag = atoi (buf);	765	tag_t tag = atoi (buf);
768
769	/* sort of a hack, but if the player saves and the player then manually
770	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
771	*/
772	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
773	return;
774		766
775	/* If the high bit is set, player applied a pseudo object. */	767	/* If the high bit is set, player applied a pseudo object. */
776	if (tag & 0x80000000)	768	if (tag & 0x80000000)
777	{	769	{
778	pl->ns->look_position = tag & 0x7fffffff;	770	pl->ns->look_position = tag & 0x7fffffff;
…		…
903		895
904	/** Move an object to a new location */	896	/** Move an object to a new location */
905	void	897	void
906	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	898	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
907	{	899	{
908	object op, env;
909
910	op = esrv_get_ob_from_count (pl, tag);	900	object *op = esrv_get_ob_from_count (pl, tag);
911	if (!op)	901	if (!op)
912	{	902	{
913	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	903	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
914	return;	904	return;
915	}	905	}
…		…
922	/* If it is an active container, then we should drop all objects	912	/* If it is an active container, then we should drop all objects
923	* in the container and not the container itself.	913	* in the container and not the container itself.
924	*/	914	*/
925	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	915	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926	{	916	{
927	object current, next;
928
929	int cnt = MAX_ITEM_PER_DROP;	917	int cnt = MAX_ITEM_PER_DROP;
930		918
931	for (current = op->inv; current != NULL; current = next)	919	for (object *current = op->inv; current && cnt--; )
932	{	920	{
933	next = current->below;	921	object *next = current->below;
934	drop_object (pl, current, 0);	922	drop_object (pl, current, 0);
935		923	current = next;
936	if (--cnt <= 0) break;
937	}	924	}
938		925
939	if (cnt <= 0)	926	if (cnt <= 0)
940	op->failmsg ("Only dropped some items, can't drop that many items at once.");	927	op->failmsg ("Only dropped some items, can't drop that many items at once.");
941
942	esrv_update_item (UPD_WEIGHT, pl, op);
943	}	928	}
944	else	929	else
945	drop_object (pl, op, nrof);	930	drop_object (pl, op, nrof);
946
947	update_after_inventory_change (pl);
948		931
949	return;	932	return;
950	}	933	}
951	else if (to == pl->count)	934	else if (to == pl->count)
952	{ /* pick it up to the inventory */	935	{ /* pick it up to the inventory */
…		…
969	/* put_object_in_sack presumes that necessary sanity checking	952	/* put_object_in_sack presumes that necessary sanity checking
970	* has already been done (eg, it can be picked up and fits in	953	* has already been done (eg, it can be picked up and fits in
971	* in a sack, so check for those things. We should also check	954	* in a sack, so check for those things. We should also check
972	* an make sure env is in fact a container for that matter.	955	* an make sure env is in fact a container for that matter.
973	*/	956	*/
974	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	957	if (env->type == CONTAINER
975	{	958	&& can_pick (pl, op)
		959	&& sack_can_hold (pl, env, op, nrof))
976	put_object_in_sack (pl, env, op, nrof);	960	put_object_in_sack (pl, env, op, nrof);
977	update_after_inventory_change (pl);
978	}
979	}	961	}
980		962

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.59 by root, Tue Apr 22 02:46:18 2008 UTC vs. Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.59 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC