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.111 by root, Sun Jul 1 04:08:14 2007 UTC

… …
471 471
472 ns->send_packet (cmdback); 472 ns->send_packet (cmdback);
473} 473}
474 474
475/** 475/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 476 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 477 * etc.)
499 */ 478 */
500void 479void
501PlayerCmd (char *buf, int len, player *pl) 480PlayerCmd (char *buf, int len, player *pl)
… …
747 726
748 //TODO: maybe golem should become the current_weapon, quite simply? 727 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 728 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 729 buf << " Golem*: " << pl->golem->name;
751 730
731 buf << '\0';
752 buf.linearise (obuf); 732 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 733}
755 734
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 735#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 736 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 737 sl << uint8 (Type) << uint64 (New); \
… …
795 return; 774 return;
796 775
797 object *ob = pl->observe; 776 object *ob = pl->observe;
798 if (!ob) 777 if (!ob)
799 return; 778 return;
779
780 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
800 781
801 packet sl ("stats"); 782 packet sl ("stats");
802 783
803 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 784 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
804 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 785 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
813 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 794 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
814 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 795 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
815 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 796 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
816 797
817 for (int s = 0; s < NUM_SKILLS; s++) 798 for (int s = 0; s < NUM_SKILLS; s++)
818 if (object *skill = pl->last_skill_ob[s]) 799 if (object *skill = opl->last_skill_ob[s])
819 if (skill->stats.exp != ns->last_skill_exp [s]) 800 if (skill->stats.exp != ns->last_skill_exp [s])
820 { 801 {
821 ns->last_skill_exp [s] = skill->stats.exp; 802 ns->last_skill_exp [s] = skill->stats.exp;
822 803
823 /* Always send along the level if exp changes. This is only 804 /* 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); 819 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); 820 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
840 821
841 flags = 0; 822 flags = 0;
842 823
843 if (pl->fire_on) 824 if (opl->fire_on)
844 flags |= SF_FIREON; 825 flags |= SF_FIREON;
845 826
846 if (pl->run_on) 827 if (opl->run_on)
847 flags |= SF_RUNON; 828 flags |= SF_RUNON;
848 829
849 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 830 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
850 831
851 if (ns->sc_version < 1025) 832 if (ns->sc_version < 1025)
… …
865 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 846 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); 847 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); 848 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
868 } 849 }
869 850
870 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 851 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
871 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 852 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
872 set_title (ob, buf); 853 set_title (ob, buf);
873 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 854 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
874 855
875 /* Only send it away if we have some actual data */ 856 /* Only send it away if we have some actual data */
… …
1028 */ 1009 */
1029 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1010 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1030 return; 1011 return;
1031 1012
1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1013 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1033 sint16 nx, ny;
1034 int estartlen, eoldlen; 1014 int estartlen, eoldlen;
1035 uint8 eentrysize; 1015 uint8 eentrysize;
1036 uint16 ewhatstart, ewhatflag; 1016 uint16 ewhatstart, ewhatflag;
1037 uint8 extendedinfos; 1017 uint8 extendedinfos;
1038 maptile *m;
1039 1018
1040 check_map_change (pl); 1019 check_map_change (pl);
1041 prefetch_surrounding_maps (pl->ob); 1020 prefetch_surrounding_maps (pl->ob);
1042 1021
1043 /* do LOS after calls to update_position */ 1022 /* do LOS after calls to update_position */
… …
1109 max_x = ob->x + (socket.mapx + 1) / 2; 1088 max_x = ob->x + (socket.mapx + 1) / 2;
1110 max_y = ob->y + (socket.mapy + 1) / 2; 1089 max_y = ob->y + (socket.mapy + 1) / 2;
1111 1090
1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1091 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1113 { 1092 {
1093 sint16 nx, ny;
1094 maptile *m = 0;
1095
1114 ax = 0; 1096 ax = 0;
1115 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1097 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1116 { 1098 {
1099 // check to see if we can simply go one right quickly
1100 ++nx;
1101 if (m && nx >= m->width)
1102 m = 0;
1103
1104 if (!m)
1105 {
1106 nx = x; ny = y; m = plmap;
1107
1108 if (!xy_normalise (m, nx, ny))
1109 m = 0;
1110 }
1111
1117 int emask, mask; 1112 int emask, mask;
1118 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1113 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1119 1114
1120 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1115 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1121 1116
1122 /* If the coordinates are not valid, or it is too dark to see, 1117 /* If the coordinates are not valid, or it is too dark to see,
1123 * we tell the client as such 1118 * we tell the client as such
1124 */ 1119 */
1125 nx = x;
1126 ny = y;
1127 m = get_map_from_coord (plmap, &nx, &ny);
1128
1129 if (!m) 1120 if (!m)
1130 { 1121 {
1131 /* space is out of map. Update space and clear values 1122 /* space is out of map. Update space and clear values
1132 * if this hasn't already been done. If the space is out 1123 * if this hasn't already been done. If the space is out
1133 * of the map, it shouldn't have a head 1124 * of the map, it shouldn't have a head
… …
1214 } 1205 }
1215 1206
1216 lastcell.count = d; 1207 lastcell.count = d;
1217 1208
1218 mapspace &ms = m->at (nx, ny); 1209 mapspace &ms = m->at (nx, ny);
1210 ms.update ();
1219 1211
1220 if (socket.extmap) 1212 if (socket.extmap)
1221 { 1213 {
1222 uint8 stat_hp = 0; 1214 uint8 stat_hp = 0;
1223 uint8 stat_width = 0; 1215 uint8 stat_width = 0;

Diff Legend

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