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.56 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
290 { 291 {
291 int dir = *buf++; 292 int dir = *buf++;
292 293
293 switch (dir) 294 switch (dir)
294 { 295 {
295 case '1': 296 case '1':
296 dx = 0; 297 dx = 0;
297 dy = -1; 298 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 300 map && (mapy -= map->height);
300 break; 301 break;
301 case '2': 302 case '2':
302 mapx += map->width; 303 mapx += map->width;
303 dx = map->width; 304 dx = map->width;
304 dy = 0; 305 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
306 break; 307 break;
307 case '3': 308 case '3':
308 mapy += map->height; 309 mapy += map->height;
309 dx = 0; 310 dx = 0;
310 dy = map->height; 311 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
312 break; 313 break;
313 case '4': 314 case '4':
314 dx = -1; 315 dx = -1;
315 dy = 0; 316 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 318 map && (mapx -= map->width);
318 break; 319 break;
319 } 320 }
320 321
321 --max_distance; 322 --max_distance;
322 } 323 }
323 324
914{ 915{
915 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
916} 917}
917 918
918/** client wants the map resent */ 919/** client wants the map resent */
919
920void 920void
921MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
922{ 922{
923/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
924 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
1589 uint8 extendedinfos; 1589 uint8 extendedinfos;
1590 maptile *m; 1590 maptile *m;
1591 1591
1592 client &socket = *pl->contr->ns; 1592 client &socket = *pl->contr->ns;
1593 1593
1594 if (!pl->active ())
1595 return;
1596
1594 check_map_change (pl->contr); 1597 check_map_change (pl->contr);
1595 1598
1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1599 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1597 packet esl; 1600 packet esl;
1598 1601

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines