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.60 by root, Sun Jan 7 02:39:15 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
… …
845 846
846 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
848 break; 849 break;
849 850
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
856 break; 853 break;
857 854
858 default: 855 default:
… …
914{ 911{
915 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
916} 913}
917 914
918/** client wants the map resent */ 915/** client wants the map resent */
919
920void 916void
921MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
922{ 918{
923/* This function is currently disabled; just clearing the map state results in 919/* 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. 920 * display errors. It should clear the cache and send a newmap command.
… …
1589 uint8 extendedinfos; 1585 uint8 extendedinfos;
1590 maptile *m; 1586 maptile *m;
1591 1587
1592 client &socket = *pl->contr->ns; 1588 client &socket = *pl->contr->ns;
1593 1589
1590 if (!pl->active)
1591 return;
1592
1594 check_map_change (pl->contr); 1593 check_map_change (pl->contr);
1595 1594
1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1597 packet esl; 1596 packet esl;
1598 1597

Diff Legend

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