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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.207 by root, Mon Sep 29 10:32:50 2008 UTC

…		…
366	attachable::do_destroy ();	366	attachable::do_destroy ();
367		367
368	if (ob)	368	if (ob)
369	{	369	{
370	ob->destroy_inv (false);	370	ob->destroy_inv (false);
371	ob->destroy (true);	371	ob->destroy ();
372	}	372	}
373		373
374	ob = observe = 0;	374	ob = observe = 0;
375	}	375	}
376		376
…		…
668	\|\| op->type == CLOAK \|\| op->type == HELMET	668	\|\| op->type == CLOAK \|\| op->type == HELMET
669	\|\| op->type == SHIELD \|\| op->type == GLOVES	669	\|\| op->type == SHIELD \|\| op->type == GLOVES
670	\|\| op->type == BRACERS \|\| op->type == GIRDLE))	670	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
671	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	671	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
672	{	672	{
673	op->destroy (true);	673	op->destroy ();
674	continue;	674	continue;
675	}	675	}
676	}	676	}
677		677
678	/* This really needs to be better - we should really give	678	/* This really needs to be better - we should really give
…		…
689	if (tmp->type == op->type && tmp->name == op->name)	689	if (tmp->type == op->type && tmp->name == op->name)
690	break;	690	break;
691		691
692	if (tmp)	692	if (tmp)
693	{	693	{
694	op->destroy (true);	694	op->destroy ();
695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
696	continue;	696	continue;
697	}	697	}
698		698
699	if (op->nrof > 1)	699	if (op->nrof > 1)
…		…
714	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
715	}	715	}
716		716
717	if (op->type == SPELL)	717	if (op->type == SPELL)
718	{	718	{
719	op->destroy (true);	719	op->destroy ();
720	continue;	720	continue;
721	}	721	}
722	else if (op->type == SKILL)	722	else if (op->type == SKILL)
723	{	723	{
724	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
…		…
1579		1579
1580	/* this should not happen, but sometimes does */	1580	/* this should not happen, but sometimes does */
1581	if (arrow->nrof == 0)	1581	if (arrow->nrof == 0)
1582	{	1582	{
1583	LOG (llevError \| logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());	1583	LOG (llevError \| logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1584	arrow->destroy (true);	1584	arrow->destroy ();
1585	return 0;	1585	return 0;
1586	}	1586	}
1587		1587
1588	left = arrow; /* these are arrows left to the player */	1588	left = arrow; /* these are arrows left to the player */
1589	arrow = arrow->split ();	1589	arrow = arrow->split ();
…		…
2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2254	{	2254	{
2255	op->play_sound (sound_find ("ob_evaporate"));	2255	op->play_sound (sound_find ("ob_evaporate"));
2256	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2256	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2257		2257
2258	tmp->destroy (true);	2258	tmp->destroy ();
2259	CLEAR_FLAG (op, FLAG_LIFESAVE);	2259	CLEAR_FLAG (op, FLAG_LIFESAVE);
2260		2260
2261	if (op->stats.hp < 0)	2261	if (op->stats.hp < 0)
2262	op->stats.hp = op->stats.maxhp;	2262	op->stats.hp = op->stats.maxhp;
2263		2263
…		…
2569	op->stats.food = 0;	2569	op->stats.food = 0;
2570		2570
2571	if (op->stats.hp < 0)	2571	if (op->stats.hp < 0)
2572	{	2572	{
2573	op->contr->killer = archetype::get ("killer_starvation");	2573	op->contr->killer = archetype::get ("killer_starvation");
2574	op->contr->killer->destroy (true);	2574	op->contr->killer->destroy ();
2575	}	2575	}
2576	}	2576	}
2577		2577
2578	/* killer should be set here already */	2578	/* killer should be set here already */
2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
…		…
2610		2610
2611	/* restore player */	2611	/* restore player */
2612	at = archetype::find ("poisoning");	2612	at = archetype::find ("poisoning");
2613	if (object *tmp = present_arch_in_ob (at, op))	2613	if (object *tmp = present_arch_in_ob (at, op))
2614	{	2614	{
2615	tmp->destroy (true);	2615	tmp->destroy ();
2616	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2616	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2617	}	2617	}
2618		2618
2619	at = archetype::find ("confusion");	2619	at = archetype::find ("confusion");
2620	if (object *tmp = present_arch_in_ob (at, op))	2620	if (object *tmp = present_arch_in_ob (at, op))
2621	{	2621	{
2622	tmp->destroy (true);	2622	tmp->destroy ();
2623	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2623	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2624	}	2624	}
2625		2625
2626	cure_disease (op, 0, 0); /* remove any disease */	2626	cure_disease (op, 0, 0); /* remove any disease */
2627	op->stats.hp = op->stats.maxhp;	2627	op->stats.hp = op->stats.maxhp;
…		…
2812	at = archetype::find ("poisoning");	2812	at = archetype::find ("poisoning");
2813	tmp = present_arch_in_ob (at, op);	2813	tmp = present_arch_in_ob (at, op);
2814		2814
2815	if (tmp)	2815	if (tmp)
2816	{	2816	{
2817	tmp->destroy (true);	2817	tmp->destroy ();
2818	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2818	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2819	}	2819	}
2820		2820
2821	at = archetype::find ("confusion");	2821	at = archetype::find ("confusion");
2822	tmp = present_arch_in_ob (at, op);	2822	tmp = present_arch_in_ob (at, op);
2823	if (tmp)	2823	if (tmp)
2824	{	2824	{
2825	tmp->destroy (true);	2825	tmp->destroy ();
2826	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2826	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2827	}	2827	}
2828		2828
2829	cure_disease (op, 0, 0); /* remove any disease */	2829	cure_disease (op, 0, 0); /* remove any disease */
2830		2830
…		…
2833	for (object *item = op->inv; item; )	2833	for (object *item = op->inv; item; )
2834	{	2834	{
2835	object *next = item->below;	2835	object *next = item->below;
2836		2836
2837	if (item->type == SPELL_EFFECT && item->active)	2837	if (item->type == SPELL_EFFECT && item->active)
2838	item->destroy (true);	2838	item->destroy ();
2839		2839
2840	item = next;	2840	item = next;
2841	}	2841	}
2842		2842
2843	/add_exp(op, (op->stats.exp -0.20)); */	2843	/add_exp(op, (op->stats.exp -0.20)); */
…		…
2924	{	2924	{
2925	tmp->decrease (rndm (1, tmp->nrof - 1));	2925	tmp->decrease (rndm (1, tmp->nrof - 1));
2926	insert_ob_in_map (tmp, op->map, NULL, 0);	2926	insert_ob_in_map (tmp, op->map, NULL, 0);
2927	}	2927	}
2928	else	2928	else
2929	tmp->destroy (true);	2929	tmp->destroy ();
2930	}	2930	}
2931	else	2931	else
2932	insert_ob_in_map (tmp, op->map, NULL, 0);	2932	insert_ob_in_map (tmp, op->map, NULL, 0);
2933	}	2933	}
2934	}	2934	}
…		…
2995	if (op->type == PLAYER)	2995	if (op->type == PLAYER)
2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);	2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
2997		2997
2998	cast_spell (op, throw_ob, dir, spob, NULL);	2998	cast_spell (op, throw_ob, dir, spob, NULL);
2999		2999
3000	throw_ob->destroy (true);	3000	throw_ob->destroy ();
3001	}	3001	}
3002		3002
3003	void	3003	void
3004	make_visible (object *op)	3004	make_visible (object *op)
3005	{	3005	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.207 by root, Mon Sep 29 10:32:50 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.207 by root, Mon Sep 29 10:32:50 2008 UTC