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.108 by root, Sat Jun 9 20:51:45 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 */
… …
1031 */ 1030 */
1032 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1033 return; 1032 return;
1034 1033
1035 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1036 sint16 nx, ny;
1037 int estartlen, eoldlen; 1035 int estartlen, eoldlen;
1038 uint8 eentrysize; 1036 uint8 eentrysize;
1039 uint16 ewhatstart, ewhatflag; 1037 uint16 ewhatstart, ewhatflag;
1040 uint8 extendedinfos; 1038 uint8 extendedinfos;
1041 maptile *m;
1042 1039
1043 check_map_change (pl); 1040 check_map_change (pl);
1044 prefetch_surrounding_maps (pl->ob); 1041 prefetch_surrounding_maps (pl->ob);
1045 1042
1046 /* do LOS after calls to update_position */ 1043 /* do LOS after calls to update_position */
… …
1112 max_x = ob->x + (socket.mapx + 1) / 2; 1109 max_x = ob->x + (socket.mapx + 1) / 2;
1113 max_y = ob->y + (socket.mapy + 1) / 2; 1110 max_y = ob->y + (socket.mapy + 1) / 2;
1114 1111
1115 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1116 { 1113 {
1114 sint16 nx, ny;
1115 maptile *m = 0;
1116
1117 ax = 0; 1117 ax = 0;
1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1119 { 1119 {
1120 // check to see if we can simply go one right quickly
1121 ++nx;
1122 if (m && nx >= m->width)
1123 m = 0;
1124
1125 if (!m)
1126 {
1127 nx = x; ny = y; m = plmap;
1128
1129 if (!xy_normalise (m, nx, ny))
1130 m = 0;
1131 }
1132
1120 int emask, mask; 1133 int emask, mask;
1121 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1122 1135
1123 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1136 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124 1137
1125 /* If the coordinates are not valid, or it is too dark to see, 1138 /* If the coordinates are not valid, or it is too dark to see,
1126 * we tell the client as such 1139 * we tell the client as such
1127 */ 1140 */
1128 nx = x;
1129 ny = y;
1130 m = get_map_from_coord (plmap, &nx, &ny);
1131
1132 if (!m) 1141 if (!m)
1133 { 1142 {
1134 /* space is out of map. Update space and clear values 1143 /* space is out of map. Update space and clear values
1135 * if this hasn't already been done. If the space is out 1144 * if this hasn't already been done. If the space is out
1136 * of the map, it shouldn't have a head 1145 * of the map, it shouldn't have a head
… …
1217 } 1226 }
1218 1227
1219 lastcell.count = d; 1228 lastcell.count = d;
1220 1229
1221 mapspace &ms = m->at (nx, ny); 1230 mapspace &ms = m->at (nx, ny);
1231 ms.update ();
1222 1232
1223 if (socket.extmap) 1233 if (socket.extmap)
1224 { 1234 {
1225 uint8 stat_hp = 0; 1235 uint8 stat_hp = 0;
1226 uint8 stat_width = 0; 1236 uint8 stat_width = 0;

Diff Legend

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