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.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.106 by root, Thu Jun 7 17:30:43 2007 UTC

… …
522 * commands. 522 * commands.
523 */ 523 */
524 pl->count = 0; 524 pl->count = 0;
525} 525}
526 526
527
528/** 527/**
529 * This handles the general commands from the client (ie, north, fire, cast, 528 * This handles the general commands from the client (ie, north, fire, cast,
530 * etc.). It is a lot like PlayerCmd above, but is called with the 529 * etc.). It is a lot like PlayerCmd above, but is called with the
531 * 'ncom' method which gives more information back to the client so it 530 * 'ncom' method which gives more information back to the client so it
532 * can throttle. 531 * can throttle.
… …
738 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;
739 738
740 if (pl->combat_ob) 739 if (pl->combat_ob)
741 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;
742 741
742#if 0
743 //TODO: remove this when slot system is working, this is only for debugging 743 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill) 744 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name; 745 buf << " Skill*: " << pl->ob->chosen_skill->name;
746#endif
746 747
747 //TODO: maybe golem should become the current_weapon, quite simply? 748 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem) 749 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name; 750 buf << " Golem*: " << pl->golem->name;
750 751
… …
794 return; 795 return;
795 796
796 object *ob = pl->observe; 797 object *ob = pl->observe;
797 if (!ob) 798 if (!ob)
798 return; 799 return;
800
801 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799 802
800 packet sl ("stats"); 803 packet sl ("stats");
801 804
802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 805 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 806 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815 818
816 for (int s = 0; s < NUM_SKILLS; s++) 819 for (int s = 0; s < NUM_SKILLS; s++)
817 if (object *skill = pl->last_skill_ob[s]) 820 if (object *skill = opl->last_skill_ob[s])
818 if (skill->stats.exp != ns->last_skill_exp [s]) 821 if (skill->stats.exp != ns->last_skill_exp [s])
819 { 822 {
820 ns->last_skill_exp [s] = skill->stats.exp; 823 ns->last_skill_exp [s] = skill->stats.exp;
821 824
822 /* Always send along the level if exp changes. This is only 825 /* Always send along the level if exp changes. This is only
… …
837 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);
838 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);
839 842
840 flags = 0; 843 flags = 0;
841 844
842 if (pl->fire_on) 845 if (opl->fire_on)
843 flags |= SF_FIREON; 846 flags |= SF_FIREON;
844 847
845 if (pl->run_on) 848 if (opl->run_on)
846 flags |= SF_RUNON; 849 flags |= SF_RUNON;
847 850
848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 851 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849 852
850 if (ns->sc_version < 1025) 853 if (ns->sc_version < 1025)
… …
864 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);
865 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);
866 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);
867 } 870 }
868 871
869 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 */
870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 873 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871 set_title (ob, buf); 874 set_title (ob, buf);
872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 875 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873 876
874 /* Only send it away if we have some actual data */ 877 /* Only send it away if we have some actual data */
… …
1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1235 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233 { 1236 {
1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1237 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1235 { 1238 {
1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1239 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237 stat_width = op->arch->tail_x; 1240 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1238 } 1241 }
1239 } 1242 }
1240 1243
1241 if (op->msg && op->msg[0] == '@') 1244 if (op->msg && op->msg[0] == '@')
1242 flags |= 1; 1245 flags |= 1;

Diff Legend

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