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.113 by root, Mon Jul 2 02:29:34 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
… …
471 470
472 ns->send_packet (cmdback); 471 ns->send_packet (cmdback);
473} 472}
474 473
475/** 474/**
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, 475 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 476 * etc.)
499 */ 477 */
500void 478void
501PlayerCmd (char *buf, int len, player *pl) 479PlayerCmd (char *buf, int len, player *pl)
… …
533void 511void
534NewPlayerCmd (char *buf, int len, player *pl) 512NewPlayerCmd (char *buf, int len, player *pl)
535{ 513{
536 if (len <= 6) 514 if (len <= 6)
537 { 515 {
538 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 516 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539 return; 517 return;
540 } 518 }
541 519
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 520 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 521 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
731static void 709static void
732rangetostring (player *pl, char *obuf) 710rangetostring (player *pl, char *obuf)
733{ 711{
734 dynbuf_text buf; 712 dynbuf_text buf;
735 713
736 if (pl->observe->contr)
737 pl = pl->observe->contr;
738
739 if (pl->ranged_ob) 714 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 715 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 716
742 if (pl->combat_ob) 717 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 718 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
750 725
751 //TODO: maybe golem should become the current_weapon, quite simply? 726 //TODO: maybe golem should become the current_weapon, quite simply?
752 if (pl->golem) 727 if (pl->golem)
753 buf << " Golem*: " << pl->golem->name; 728 buf << " Golem*: " << pl->golem->name;
754 729
730 buf << '\0';
755 buf.linearise (obuf); 731 buf.linearise (obuf);
756 obuf [buf.size ()] = 0;
757} 732}
758 733
759#define AddIfInt64(Old,New,Type) if (Old != New) {\ 734#define AddIfInt64(Old,New,Type) if (Old != New) {\
760 Old = New; \ 735 Old = New; \
761 sl << uint8 (Type) << uint64 (New); \ 736 sl << uint8 (Type) << uint64 (New); \
… …
798 return; 773 return;
799 774
800 object *ob = pl->observe; 775 object *ob = pl->observe;
801 if (!ob) 776 if (!ob)
802 return; 777 return;
778
779 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803 780
804 packet sl ("stats"); 781 packet sl ("stats");
805 782
806 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 783 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 784 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
816 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 793 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 794 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 795 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819 796
820 for (int s = 0; s < NUM_SKILLS; s++) 797 for (int s = 0; s < NUM_SKILLS; s++)
821 if (object *skill = pl->last_skill_ob[s]) 798 if (object *skill = opl->last_skill_ob[s])
822 if (skill->stats.exp != ns->last_skill_exp [s]) 799 if (skill->stats.exp != ns->last_skill_exp [s])
823 { 800 {
824 ns->last_skill_exp [s] = skill->stats.exp; 801 ns->last_skill_exp [s] = skill->stats.exp;
825 802
826 /* Always send along the level if exp changes. This is only 803 /* 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); 818 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); 819 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
843 820
844 flags = 0; 821 flags = 0;
845 822
846 if (pl->fire_on) 823 if (opl->fire_on)
847 flags |= SF_FIREON; 824 flags |= SF_FIREON;
848 825
849 if (pl->run_on) 826 if (opl->run_on)
850 flags |= SF_RUNON; 827 flags |= SF_RUNON;
851 828
852 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 829 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853 830
854 if (ns->sc_version < 1025) 831 if (ns->sc_version < 1025)
… …
868 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 845 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); 846 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); 847 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
871 } 848 }
872 849
873 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 850 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
874 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 851 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875 set_title (ob, buf); 852 set_title (ob, buf);
876 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 853 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877 854
878 /* Only send it away if we have some actual data */ 855 /* Only send it away if we have some actual data */
… …
1031 */ 1008 */
1032 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1009 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1033 return; 1010 return;
1034 1011
1035 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1012 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1036 sint16 nx, ny;
1037 int estartlen, eoldlen; 1013 int estartlen, eoldlen;
1038 uint8 eentrysize; 1014 uint8 eentrysize;
1039 uint16 ewhatstart, ewhatflag; 1015 uint16 ewhatstart, ewhatflag;
1040 uint8 extendedinfos; 1016 uint8 extendedinfos;
1041 maptile *m;
1042 1017
1043 check_map_change (pl); 1018 check_map_change (pl);
1044 prefetch_surrounding_maps (pl->ob); 1019 prefetch_surrounding_maps (pl->ob);
1045 1020
1046 /* do LOS after calls to update_position */ 1021 /* do LOS after calls to update_position */
… …
1112 max_x = ob->x + (socket.mapx + 1) / 2; 1087 max_x = ob->x + (socket.mapx + 1) / 2;
1113 max_y = ob->y + (socket.mapy + 1) / 2; 1088 max_y = ob->y + (socket.mapy + 1) / 2;
1114 1089
1115 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1090 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1116 { 1091 {
1092 sint16 nx, ny;
1093 maptile *m = 0;
1094
1117 ax = 0; 1095 ax = 0;
1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1096 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1119 { 1097 {
1098 // check to see if we can simply go one right quickly
1099 ++nx;
1100 if (m && nx >= m->width)
1101 m = 0;
1102
1103 if (!m)
1104 {
1105 nx = x; ny = y; m = plmap;
1106
1107 if (!xy_normalise (m, nx, ny))
1108 m = 0;
1109 }
1110
1120 int emask, mask; 1111 int emask, mask;
1121 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1112 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1122 1113
1123 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1114 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124 1115
1125 /* If the coordinates are not valid, or it is too dark to see, 1116 /* If the coordinates are not valid, or it is too dark to see,
1126 * we tell the client as such 1117 * we tell the client as such
1127 */ 1118 */
1128 nx = x;
1129 ny = y;
1130 m = get_map_from_coord (plmap, &nx, &ny);
1131
1132 if (!m) 1119 if (!m)
1133 { 1120 {
1134 /* space is out of map. Update space and clear values 1121 /* space is out of map. Update space and clear values
1135 * if this hasn't already been done. If the space is out 1122 * if this hasn't already been done. If the space is out
1136 * of the map, it shouldn't have a head 1123 * of the map, it shouldn't have a head
… …
1217 } 1204 }
1218 1205
1219 lastcell.count = d; 1206 lastcell.count = d;
1220 1207
1221 mapspace &ms = m->at (nx, ny); 1208 mapspace &ms = m->at (nx, ny);
1209 ms.update ();
1222 1210
1223 if (socket.extmap) 1211 if (socket.extmap)
1224 { 1212 {
1225 uint8 stat_hp = 0; 1213 uint8 stat_hp = 0;
1226 uint8 stat_width = 0; 1214 uint8 stat_width = 0;

Diff Legend

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