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.177 by root, Sat Oct 16 22:51:52 2010 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25//+GPL 25//+GPL
26 26
… …
158 client &socket = *pl->ns; 158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint; 159 object *ob = pl->viewpoint;
160 160
161 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
162 { 162 {
163 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
164 { 164 {
165 int flags = 0; 165 int flags = 0;
166 166
167 // due to historical glitches, the bit ordering and map index ordering differs
167 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
168 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
169 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
170 if (ob->map->tile_path[3]) flags |= 8; 171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
171 175
172 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
174 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
175 } 179 }
… …
190 { 194 {
191 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
192 socket.current_region = reg; 196 socket.current_region = reg;
193 } 197 }
194 198
195 // first try to aovid a full newmap on tiled map scrolls 199 // first try to avoid a full newmap on tiled map scrolls
196 if (socket.current_map != ob->map && !socket.force_newmap) 200 if (socket.current_map != ob->map && !socket.force_newmap)
197 { 201 {
198 rv_vector rv; 202 rv_vector rv;
199 203
200 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
… …
341 345
342 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
343 { 347 {
344 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
345 349
346 if (dir >= 0 && dir <= 3) 350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
347 { 355 {
356 dir = dirmap [dir];
357
348 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
349 map = 0; 359 map = 0;
350 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
351 { 361 {
352 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
375 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
376 else 386 else
377 { 387 {
378 int flags = 0; 388 int flags = 0;
379 389
390 // due to historical glitches, the bit ordering and map index ordering differs
380 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
381 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
382 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
383 if (map->tile_path[3]) flags |= 8; 394 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path [TILE_UP ]) flags |= 0x10;
397 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
384 398
385 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
386 } 400 }
387 401
388 return 1; 402 return 1;
… …
873 887
874 /* Nothing changed */ 888 /* Nothing changed */
875 return 0; 889 return 0;
876} 890}
877 891
878//-GPL
879
880// prefetch maps in an area of PREFETCH x PREFETCH around the player
881#define PREFETCH 40
882
883// prefetch a generous area around the player
884static void
885prefetch_surrounding_maps (object *op)
886{
887 for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
888 op->x - PREFETCH , op->y - PREFETCH ,
889 op->x + PREFETCH + 1, op->y + PREFETCH + 1);
890 rect->m;
891 ++rect)
892 rect->m->touch ();
893}
894
895//+GPL
896
897/** 892/**
898 * Draws client map. 893 * Draws client map.
899 */ 894 */
900void 895void
901draw_client_map (player *pl) 896draw_client_map (player *pl)
… …
906 901
907 /* If player is just joining the game, he isn't here yet, so the map 902 /* If player is just joining the game, he isn't here yet, so the map
908 * can get swapped out. If so, don't try to send them a map. All will 903 * can get swapped out. If so, don't try to send them a map. All will
909 * be OK once they really log in. 904 * be OK once they really log in.
910 */ 905 */
911 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
912 return; 907 return;
913 908
914 int startlen, oldlen; 909 int startlen, oldlen;
915 910
916 check_map_change (pl); 911 check_map_change (pl);
917 prefetch_surrounding_maps (pl->ob); 912 pl->ob->prefetch_surrounding_maps ();
918 913
919 /* do LOS after calls to update_position */ 914 /* do LOS after calls to update_position */
920 /* unfortunately, we need to udpate los when observing, currently */ 915 /* unfortunately, we need to udpate los when observing, currently */
921 if (pl->do_los || pl->viewpoint != pl->ob) 916 if (pl->do_los || pl->viewpoint != pl->ob)
922 { 917 {
… …
1240 1235
1241/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
1242static void 1237static void
1243append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
1244{ 1239{
1245 int i, skill = 0; 1240 int skill = 0;
1246 1241
1247 if (!(spell->name)) 1242 if (!(spell->name))
1248 { 1243 {
1249 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1250 return; 1245 return;

Diff Legend

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