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.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)
… …
731static void 710static void
732rangetostring (player *pl, char *obuf) 711rangetostring (player *pl, char *obuf)
733{ 712{
734 dynbuf_text buf; 713 dynbuf_text buf;
735 714
736 if (pl->observe->contr)
737 pl = pl->observe->contr;
738
739 if (pl->ranged_ob) 715 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 716 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 717
742 if (pl->combat_ob) 718 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 719 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
750 726
751 //TODO: maybe golem should become the current_weapon, quite simply? 727 //TODO: maybe golem should become the current_weapon, quite simply?
752 if (pl->golem) 728 if (pl->golem)
753 buf << " Golem*: " << pl->golem->name; 729 buf << " Golem*: " << pl->golem->name;
754 730
731 buf << '\0';
755 buf.linearise (obuf); 732 buf.linearise (obuf);
756 obuf [buf.size ()] = 0;
757} 733}
758 734
759#define AddIfInt64(Old,New,Type) if (Old != New) {\ 735#define AddIfInt64(Old,New,Type) if (Old != New) {\
760 Old = New; \ 736 Old = New; \
761 sl << uint8 (Type) << uint64 (New); \ 737 sl << uint8 (Type) << uint64 (New); \
… …
798 return; 774 return;
799 775
800 object *ob = pl->observe; 776 object *ob = pl->observe;
801 if (!ob) 777 if (!ob)
802 return; 778 return;
779
780 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803 781
804 packet sl ("stats"); 782 packet sl ("stats");
805 783
806 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 784 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 785 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
816 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 794 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 795 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 796 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819 797
820 for (int s = 0; s < NUM_SKILLS; s++) 798 for (int s = 0; s < NUM_SKILLS; s++)
821 if (object *skill = pl->last_skill_ob[s]) 799 if (object *skill = opl->last_skill_ob[s])
822 if (skill->stats.exp != ns->last_skill_exp [s]) 800 if (skill->stats.exp != ns->last_skill_exp [s])
823 { 801 {
824 ns->last_skill_exp [s] = skill->stats.exp; 802 ns->last_skill_exp [s] = skill->stats.exp;
825 803
826 /* Always send along the level if exp changes. This is only 804 /* 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); 819 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); 820 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
843 821
844 flags = 0; 822 flags = 0;
845 823
846 if (pl->fire_on) 824 if (opl->fire_on)
847 flags |= SF_FIREON; 825 flags |= SF_FIREON;
848 826
849 if (pl->run_on) 827 if (opl->run_on)
850 flags |= SF_RUNON; 828 flags |= SF_RUNON;
851 829
852 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 830 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853 831
854 if (ns->sc_version < 1025) 832 if (ns->sc_version < 1025)
… …
868 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);
869 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);
870 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);
871 } 849 }
872 850
873 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 */
874 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 852 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875 set_title (ob, buf); 853 set_title (ob, buf);
876 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 854 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877 855
878 /* Only send it away if we have some actual data */ 856 /* Only send it away if we have some actual data */
… …
1031 */ 1009 */
1032 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1010 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1033 return; 1011 return;
1034 1012
1035 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1013 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1036 sint16 nx, ny;
1037 int estartlen, eoldlen; 1014 int estartlen, eoldlen;
1038 uint8 eentrysize; 1015 uint8 eentrysize;
1039 uint16 ewhatstart, ewhatflag; 1016 uint16 ewhatstart, ewhatflag;
1040 uint8 extendedinfos; 1017 uint8 extendedinfos;
1041 maptile *m;
1042 1018
1043 check_map_change (pl); 1019 check_map_change (pl);
1044 prefetch_surrounding_maps (pl->ob); 1020 prefetch_surrounding_maps (pl->ob);
1045 1021
1046 /* do LOS after calls to update_position */ 1022 /* do LOS after calls to update_position */
… …
1112 max_x = ob->x + (socket.mapx + 1) / 2; 1088 max_x = ob->x + (socket.mapx + 1) / 2;
1113 max_y = ob->y + (socket.mapy + 1) / 2; 1089 max_y = ob->y + (socket.mapy + 1) / 2;
1114 1090
1115 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++)
1116 { 1092 {
1093 sint16 nx, ny;
1094 maptile *m = 0;
1095
1117 ax = 0; 1096 ax = 0;
1118 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++)
1119 { 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
1120 int emask, mask; 1112 int emask, mask;
1121 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1113 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1122 1114
1123 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1115 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124 1116
1125 /* 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,
1126 * we tell the client as such 1118 * we tell the client as such
1127 */ 1119 */
1128 nx = x;
1129 ny = y;
1130 m = get_map_from_coord (plmap, &nx, &ny);
1131
1132 if (!m) 1120 if (!m)
1133 { 1121 {
1134 /* space is out of map. Update space and clear values 1122 /* space is out of map. Update space and clear values
1135 * 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
1136 * of the map, it shouldn't have a head 1124 * of the map, it shouldn't have a head
… …
1217 } 1205 }
1218 1206
1219 lastcell.count = d; 1207 lastcell.count = d;
1220 1208
1221 mapspace &ms = m->at (nx, ny); 1209 mapspace &ms = m->at (nx, ny);
1210 ms.update ();
1222 1211
1223 if (socket.extmap) 1212 if (socket.extmap)
1224 { 1213 {
1225 uint8 stat_hp = 0; 1214 uint8 stat_hp = 0;
1226 uint8 stat_width = 0; 1215 uint8 stat_width = 0;

Diff Legend

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