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.174 by root, Thu Apr 15 00:40:34 2010 UTC vs.
Revision 1.186 by root, Tue Jan 3 11:25:37 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
… …
146 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
147 147
148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149 149
150 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
151
152 if (pl->ns->newmapcmd == 1)
153 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
154
155 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
156} 153}
157 154
158static void 155static void
159send_map_info (player *pl) 156send_map_info (player *pl)
… …
161 client &socket = *pl->ns; 158 client &socket = *pl->ns;
162 object *ob = pl->viewpoint; 159 object *ob = pl->viewpoint;
163 160
164 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
165 { 162 {
166 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
167 { 164 {
168 int flags = 0; 165 int flags = 0;
169 166
167 // due to historical glitches, the bit ordering and map index ordering differs
170 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
171 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
172 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
173 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;
174 175
175 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",
176 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
177 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
178 } 179 }
… …
246 247
247 for (int i = 0; i < skillvec.size (); ++i) 248 for (int i = 0; i < skillvec.size (); ++i)
248 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name); 249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
249 250
250 if (sl.length () > MAXSOCKBUF) 251 if (sl.length () > MAXSOCKBUF)
251 {
252 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 252 cleanup ("buffer overflow in send_skill_info!");
253 fatal (0);
254 }
255 253
256 ns->send_packet (sl); 254 ns->send_packet (sl);
257} 255}
258 256
259/** 257/**
… …
269 267
270 for (int i = 0; i < NRSPELLPATHS; i++) 268 for (int i = 0; i < NRSPELLPATHS; i++)
271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
272 270
273 if (sl.length () > MAXSOCKBUF) 271 if (sl.length () > MAXSOCKBUF)
274 {
275 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 272 cleanup ("buffer overflow in send_spell_paths!");
276 fatal (0);
277 }
278 273
279 ns->send_packet (sl); 274 ns->send_packet (sl);
280} 275}
281 276
282/** 277/**
… …
350 345
351 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
352 { 347 {
353 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
354 349
355 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)))
356 { 355 {
356 dir = dirmap [dir];
357
357 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
358 map = 0; 359 map = 0;
359 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
360 { 361 {
361 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
384 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
385 else 386 else
386 { 387 {
387 int flags = 0; 388 int flags = 0;
388 389
390 // due to historical glitches, the bit ordering and map index ordering differs
389 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
390 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
391 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
392 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;
393 398
394 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);
395 } 400 }
396 401
397 return 1; 402 return 1;
… …
882 887
883 /* Nothing changed */ 888 /* Nothing changed */
884 return 0; 889 return 0;
885} 890}
886 891
887//-GPL
888
889// prefetch (and touch) all maps within a specific distancd
890static void
891prefetch_surrounding_maps (maptile *map, int distance)
892{
893 map->touch ();
894
895 if (--distance)
896 for (int dir = 4; dir--; )
897 if (const shstr &path = map->tile_path [dir])
898 if (maptile *&neigh = map->tile_map [dir])
899 prefetch_surrounding_maps (neigh, distance);
900 else
901 neigh = maptile::find_async (path, map);
902}
903
904// prefetch a generous area around the player
905static void
906prefetch_surrounding_maps (object *op)
907{
908 prefetch_surrounding_maps (op->map, 3);
909}
910
911//+GPL
912
913/** 892/**
914 * Draws client map. 893 * Draws client map.
915 */ 894 */
916void 895void
917draw_client_map (player *pl) 896draw_client_map (player *pl)
… …
922 901
923 /* 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
924 * 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
925 * be OK once they really log in. 904 * be OK once they really log in.
926 */ 905 */
927 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
928 return; 907 return;
929 908
930 int startlen, oldlen; 909 int startlen, oldlen;
931 910
932 check_map_change (pl); 911 check_map_change (pl);
933 prefetch_surrounding_maps (pl->ob); 912 pl->ob->prefetch_surrounding_maps ();
934 913
935 /* do LOS after calls to update_position */ 914 /* do LOS after calls to update_position */
936 /* unfortunately, we need to udpate los when observing, currently */ 915 /* unfortunately, we need to udpate los when observing, currently */
937 if (pl->do_los || pl->viewpoint != pl->ob) 916 if (pl->do_los || pl->viewpoint != pl->ob)
938 { 917 {
… …
963 * look like. 942 * look like.
964 */ 943 */
965 944
966 client &socket = *pl->ns; 945 client &socket = *pl->ns;
967 946
968 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 947 packet sl ("map1a");
969 948
970 startlen = sl.length (); 949 startlen = sl.length ();
971 950
972 int hx = socket.mapx / 2; 951 int hx = socket.mapx / 2;
973 int hy = socket.mapy / 2; 952 int hy = socket.mapy / 2;
… …
1356 } 1335 }
1357 else 1336 else
1358 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
1359 1338
1360 if (sl.length () > MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
1361 {
1362 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
1363 fatal (0);
1364 }
1365 1341
1366 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1367 pl->ns->flush_fx (); 1343 pl->ns->flush_fx ();
1368 pl->ns->send_packet (sl); 1344 pl->ns->send_packet (sl);
1369} 1345}

Diff Legend

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