ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.105 by root, Wed Jun 6 17:22:55 2007 UTC vs.
Revision 1.106 by root, Thu Jun 7 17:30:43 2007 UTC

… …
731static void 731static void
732rangetostring (player *pl, char *obuf) 732rangetostring (player *pl, char *obuf)
733{ 733{
734 dynbuf_text buf; 734 dynbuf_text buf;
735 735
736 if (pl->observe->contr)
737 pl = pl->observe->contr;
738
739 if (pl->ranged_ob) 736 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 737 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 738
742 if (pl->combat_ob) 739 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 740 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
798 return; 795 return;
799 796
800 object *ob = pl->observe; 797 object *ob = pl->observe;
801 if (!ob) 798 if (!ob)
802 return; 799 return;
800
801 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803 802
804 packet sl ("stats"); 803 packet sl ("stats");
805 804
806 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 805 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 806 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
816 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819 818
820 for (int s = 0; s < NUM_SKILLS; s++) 819 for (int s = 0; s < NUM_SKILLS; s++)
821 if (object *skill = pl->last_skill_ob[s]) 820 if (object *skill = opl->last_skill_ob[s])
822 if (skill->stats.exp != ns->last_skill_exp [s]) 821 if (skill->stats.exp != ns->last_skill_exp [s])
823 { 822 {
824 ns->last_skill_exp [s] = skill->stats.exp; 823 ns->last_skill_exp [s] = skill->stats.exp;
825 824
826 /* Always send along the level if exp changes. This is only 825 /* Always send along the level if exp changes. This is only
… …
841 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 840 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
842 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 841 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
843 842
844 flags = 0; 843 flags = 0;
845 844
846 if (pl->fire_on) 845 if (opl->fire_on)
847 flags |= SF_FIREON; 846 flags |= SF_FIREON;
848 847
849 if (pl->run_on) 848 if (opl->run_on)
850 flags |= SF_RUNON; 849 flags |= SF_RUNON;
851 850
852 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 851 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853 852
854 if (ns->sc_version < 1025) 853 if (ns->sc_version < 1025)
… …
868 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 867 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
869 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 868 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
870 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 869 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
871 } 870 }
872 871
873 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 872 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
874 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 873 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875 set_title (ob, buf); 874 set_title (ob, buf);
876 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 875 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877 876
878 /* Only send it away if we have some actual data */ 877 /* Only send it away if we have some actual data */

Diff Legend

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