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.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.109 by root, Sun Jun 24 16:17:42 2007 UTC

… …
747 747
748 //TODO: maybe golem should become the current_weapon, quite simply? 748 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 749 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 750 buf << " Golem*: " << pl->golem->name;
751 751
752 buf << '\0';
752 buf.linearise (obuf); 753 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 754}
755 755
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 756#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 757 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 758 sl << uint8 (Type) << uint64 (New); \
… …
795 return; 795 return;
796 796
797 object *ob = pl->observe; 797 object *ob = pl->observe;
798 if (!ob) 798 if (!ob)
799 return; 799 return;
800
801 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
800 802
801 packet sl ("stats"); 803 packet sl ("stats");
802 804
803 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 805 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
804 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 806 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
813 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
814 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
815 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
816 818
817 for (int s = 0; s < NUM_SKILLS; s++) 819 for (int s = 0; s < NUM_SKILLS; s++)
818 if (object *skill = pl->last_skill_ob[s]) 820 if (object *skill = opl->last_skill_ob[s])
819 if (skill->stats.exp != ns->last_skill_exp [s]) 821 if (skill->stats.exp != ns->last_skill_exp [s])
820 { 822 {
821 ns->last_skill_exp [s] = skill->stats.exp; 823 ns->last_skill_exp [s] = skill->stats.exp;
822 824
823 /* Always send along the level if exp changes. This is only 825 /* Always send along the level if exp changes. This is only
… …
838 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);
839 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);
840 842
841 flags = 0; 843 flags = 0;
842 844
843 if (pl->fire_on) 845 if (opl->fire_on)
844 flags |= SF_FIREON; 846 flags |= SF_FIREON;
845 847
846 if (pl->run_on) 848 if (opl->run_on)
847 flags |= SF_RUNON; 849 flags |= SF_RUNON;
848 850
849 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 851 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
850 852
851 if (ns->sc_version < 1025) 853 if (ns->sc_version < 1025)
… …
865 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);
866 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);
867 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);
868 } 870 }
869 871
870 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 */
871 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 873 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
872 set_title (ob, buf); 874 set_title (ob, buf);
873 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 875 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
874 876
875 /* Only send it away if we have some actual data */ 877 /* Only send it away if we have some actual data */
… …
1028 */ 1030 */
1029 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1030 return; 1032 return;
1031 1033
1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1033 sint16 nx, ny;
1034 int estartlen, eoldlen; 1035 int estartlen, eoldlen;
1035 uint8 eentrysize; 1036 uint8 eentrysize;
1036 uint16 ewhatstart, ewhatflag; 1037 uint16 ewhatstart, ewhatflag;
1037 uint8 extendedinfos; 1038 uint8 extendedinfos;
1038 maptile *m;
1039 1039
1040 check_map_change (pl); 1040 check_map_change (pl);
1041 prefetch_surrounding_maps (pl->ob); 1041 prefetch_surrounding_maps (pl->ob);
1042 1042
1043 /* do LOS after calls to update_position */ 1043 /* do LOS after calls to update_position */
… …
1109 max_x = ob->x + (socket.mapx + 1) / 2; 1109 max_x = ob->x + (socket.mapx + 1) / 2;
1110 max_y = ob->y + (socket.mapy + 1) / 2; 1110 max_y = ob->y + (socket.mapy + 1) / 2;
1111 1111
1112 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++)
1113 { 1113 {
1114 sint16 nx, ny;
1115 maptile *m = 0;
1116
1114 ax = 0; 1117 ax = 0;
1115 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++)
1116 { 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
1117 int emask, mask; 1133 int emask, mask;
1118 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1119 1135
1120 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1136 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1121 1137
1122 /* 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,
1123 * we tell the client as such 1139 * we tell the client as such
1124 */ 1140 */
1125 nx = x;
1126 ny = y;
1127 m = get_map_from_coord (plmap, &nx, &ny);
1128
1129 if (!m) 1141 if (!m)
1130 { 1142 {
1131 /* space is out of map. Update space and clear values 1143 /* space is out of map. Update space and clear values
1132 * 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
1133 * of the map, it shouldn't have a head 1145 * of the map, it shouldn't have a head
… …
1214 } 1226 }
1215 1227
1216 lastcell.count = d; 1228 lastcell.count = d;
1217 1229
1218 mapspace &ms = m->at (nx, ny); 1230 mapspace &ms = m->at (nx, ny);
1231 ms.update ();
1219 1232
1220 if (socket.extmap) 1233 if (socket.extmap)
1221 { 1234 {
1222 uint8 stat_hp = 0; 1235 uint8 stat_hp = 0;
1223 uint8 stat_width = 0; 1236 uint8 stat_width = 0;

Diff Legend

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