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.145 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
208 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 210 {
210 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
212 213
213 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
214 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215 else
216 {
217 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 215 socket.floorbox_reset ();
219 }
220 } 216 }
221 217
222 socket.current_x = ob->x; 218 socket.current_x = ob->x;
223 socket.current_y = ob->y; 219 socket.current_y = ob->y;
224} 220}
… …
429 while (1) 425 while (1)
430 { 426 {
431 /* 1. Extract an info */ 427 /* 1. Extract an info */
432 info = nextinfo; 428 info = nextinfo;
433 429
434 while ((info < len) && (buf[info] == ' ')) 430 while ((info < len) && (buf [info] == ' '))
435 info++; 431 info++;
436 432
437 if (info >= len) 433 if (info >= len)
438 break; 434 break;
439 435
440 nextinfo = info + 1; 436 nextinfo = info + 1;
441 437
442 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 438 while ((nextinfo < len) && (buf [nextinfo] != ' '))
443 nextinfo++; 439 nextinfo++;
444 440
445 if (nextinfo - info >= 49) /*Erroneous info asked */ 441 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue; 442 continue;
447 443
448 strncpy (command, &(buf[info]), nextinfo - info); 444 memcpy (command, buf + info, nextinfo - info);
449 command[nextinfo - info] = '\0'; 445 command [nextinfo - info] = 0;
446
450 /* 2. Interpret info */ 447 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag); 448 i = sscanf (command, "%d", &flag);
452 449
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 450 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag); 451 ns->supported_readables |= (1 << flag);
… …
488 return; 485 return;
489 486
490 buf++; 487 buf++;
491 } 488 }
492 489
493 execute_newserver_command (pl->ob, (char *) buf); 490 execute_newserver_command (pl->ob, (char *)buf);
494 491
495 /* Perhaps something better should be done with a left over count. 492 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 493 * Cleaning up the input should probably be done first - all actions
497 * for the command that issued the count should be done before any other 494 * for the command that issued the count should be done before any other
498 * commands. 495 * commands.
… …
690 * Get player's current range attack in obuf. 687 * Get player's current range attack in obuf.
691 */ 688 */
692static void 689static void
693rangetostring (player *pl, char *obuf) 690rangetostring (player *pl, char *obuf)
694{ 691{
695 dynbuf_text buf; 692 dynbuf_text &buf = msg_dynbuf; buf.clear ();
696 693
697 if (pl->ranged_ob) 694 if (pl->ranged_ob)
698 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 695 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699 696
700 if (pl->combat_ob) 697 if (pl->combat_ob)
… …
935 932
936// prefetch (and touch) all maps within a specific distancd 933// prefetch (and touch) all maps within a specific distancd
937static void 934static void
938prefetch_surrounding_maps (maptile *map, int distance) 935prefetch_surrounding_maps (maptile *map, int distance)
939{ 936{
940 map->last_access = runtime; 937 map->touch ();
941 938
942 if (--distance) 939 if (--distance)
943 for (int dir = 4; --dir; ) 940 for (int dir = 4; --dir; )
944 if (const shstr &path = map->tile_path [dir]) 941 if (const shstr &path = map->tile_path [dir])
945 if (maptile *&neigh = map->tile_map [dir]) 942 if (maptile *&neigh = map->tile_map [dir])
… …
1082 1079
1083 unsigned char dummy; 1080 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1081 unsigned char *last_ext = &dummy;
1085 1082
1086 /* Darkness changed */ 1083 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1084 if (lastcell.count != d)
1088 { 1085 {
1089 mask |= 0x8; 1086 mask |= 0x8;
1090 1087
1091 if (socket.extmap) 1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092
1093 lastcell.count = d;
1094
1095 mapspace &ms = m->at (nx, ny);
1096 ms.update ();
1097
1098 // extmap handling
1099 uint8 stat_hp = 0;
1100 uint8 stat_width = 0;
1101 uint8 flags = 0;
1102 tag_t player = 0;
1103
1104 // send hp information, if applicable
1105 if (object *op = ms.faces_obj [0])
1106 if (op->is_head () && !op->invisible)
1107 {
1108 if (op->stats.maxhp > op->stats.hp
1109 && op->stats.maxhp > 0
1110 && (op->type == PLAYER
1111 || op->type == DOOR // does not work, have maxhp 0
1112 || QUERY_FLAG (op, FLAG_MONSTER)
1113 || QUERY_FLAG (op, FLAG_ALIVE)
1114 || QUERY_FLAG (op, FLAG_GENERATOR)))
1115 {
1116 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1117 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1118 }
1119
1120 if (expect_false (op->has_dialogue ()))
1121 flags |= 1;
1122
1123 if (expect_false (op->type == PLAYER))
1124 player = op == ob ? pl->ob->count
1125 : op == pl->ob ? ob->count
1126 : op->count;
1127 }
1128
1129 if (expect_false (lastcell.stat_hp != stat_hp))
1130 {
1131 lastcell.stat_hp = stat_hp;
1132
1133 mask |= 0x8;
1134 *last_ext |= 0x80;
1135 last_ext = &sl[sl.length ()];
1136
1137 sl << uint8 (5) << uint8 (stat_hp);
1138
1139 if (stat_width > 1)
1092 { 1140 {
1093 *last_ext |= 0x80; 1141 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1142 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1143
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1116 {
1117 if (op->stats.maxhp > op->stats.hp
1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1136 }
1137
1138 if (expect_false (lastcell.stat_hp != stat_hp))
1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1145
1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1149 {
1150 *last_ext |= 0x80;
1151 last_ext = &sl[sl.length ()];
1152
1153 sl << uint8 (6) << uint8 (stat_width); 1144 sl << uint8 (6) << uint8 (stat_width);
1154 }
1155 }
1156
1157 if (expect_false (lastcell.player != player))
1158 {
1159 lastcell.player = player;
1160
1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1164
1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1175
1176 sl << uint8 (8) << uint8 (flags);
1177 } 1145 }
1178 } 1146 }
1147
1148 if (expect_false (lastcell.player != player))
1149 {
1150 lastcell.player = player;
1151
1152 mask |= 0x8;
1153 *last_ext |= 0x80;
1154 last_ext = &sl[sl.length ()];
1155
1156 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1157 }
1158
1159 if (expect_false (lastcell.flags != flags))
1160 {
1161 lastcell.flags = flags;
1162
1163 mask |= 0x8;
1164 *last_ext |= 0x80;
1165 last_ext = &sl[sl.length ()];
1166
1167 sl << uint8 (8) << uint8 (flags);
1168 }
1169
1170 // faces
1179 1171
1180 /* Floor face */ 1172 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1173 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1174 mask |= 0x4;
1183 1175

Diff Legend

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