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.50 by root, Thu Dec 21 23:37:06 2006 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
… …
176 flags |= 4; 177 flags |= 4;
177 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
178 flags |= 8; 179 flags |= 8;
179 180
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 183 }
183 else 184 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
185 186
186 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
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
… …
334 if (map->tile_path[2]) 335 if (map->tile_path[2])
335 flags |= 4; 336 flags |= 4;
336 if (map->tile_path[3]) 337 if (map->tile_path[3])
337 flags |= 8; 338 flags |= 8;
338 339
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 341 }
341 else 342 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 344 }
344 else 345 else
… …
399 { 400 {
400 ns->sound = atoi (param); 401 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 403 }
403 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
409 { 407 {
410 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 410 }
… …
569 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
570 */ 568 */
571void 569void
572AddMeCmd (char *buf, int len, client * ns) 570AddMeCmd (char *buf, int len, client * ns)
573{ 571{
574 if (INVOKE_CLIENT (ADDME, ns)) 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 return;
576
577 if (ns->pl || add_player (ns))
578 ns->send_packet ("addme_failed");
579 else
580 ns->send_packet ("addme_success");
581} 573}
582 574
583/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
584void 576void
585ToggleExtendedInfos (char *buf, int len, client * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
… …
850 { 842 {
851 case ST_PLAYING: 843 case ST_PLAYING:
852 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
853 break; 845 break;
854 846
855 case ST_PLAY_AGAIN:
856 /* We can check this for return value (2==quit). Maybe we
857 * should, and do something appropriate?
858 */
859 receive_play_again (pl->ob, buf[0]);
860 break;
861
862 case ST_ROLL_STAT:
863 key_roll_stat (pl->ob, buf[0]);
864 break;
865
866 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
867 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
868 break;
869
870 case ST_CONFIRM_QUIT:
871 key_confirm_quit (pl->ob, buf[0]);
872 break;
873
874 case ST_CONFIGURE:
875 LOG (llevError, "In client input handling, but into configure state\n");
876 ns->state = ST_PLAYING;
877 break;
878
879 case ST_GET_NAME:
880 receive_player_name (pl->ob, 13);
881 break;
882
883 case ST_GET_PASSWORD:
884 case ST_CONFIRM_PASSWORD:
885 receive_player_password (pl->ob, 13);
886 break; 849 break;
887 850
888 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
889 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
890 break; 853 break;
… …
948{ 911{
949 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
950} 913}
951 914
952/** client wants the map resent */ 915/** client wants the map resent */
953
954void 916void
955MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
956{ 918{
957/* 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
958 * 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.
… …
1044void 1006void
1045esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1046{ 1008{
1047 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1048 uint16 flags; 1010 uint16 flags;
1011
1012 if (!pl->ns)
1013 return;
1049 1014
1050 packet sl ("stats"); 1015 packet sl ("stats");
1051 1016
1052 if (pl->ob) 1017 if (pl->ob)
1053 { 1018 {
… …
1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1057 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1058 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1059 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1060 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1061 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1062 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1063 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1064 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1065 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1067 } 1032 }
1068 1033
1069 if (pl->ns->exp64)
1070 for (int s = 0; s < NUM_SKILLS; s++) 1034 for (int s = 0; s < NUM_SKILLS; s++)
1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1035 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1072 { 1036 {
1073 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1074 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1075 */ 1039 */
1076 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1077 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (pl->last_skill_ob[s]->level)
1078 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (pl->last_skill_ob[s]->stats.exp);
1079 1043
1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1081 } 1045 }
1082 1046
1083 if (pl->ns->exp64)
1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1085 else
1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1087
1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1089 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1090 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1091 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1092 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1542 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1502 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1543 1503
1544 /* If there is no object for this space, or if the face for the object 1504 /* If there is no object for this space, or if the face for the object
1545 * is the blank face, set the smoothlevel to zero. 1505 * is the blank face, set the smoothlevel to zero.
1546 */ 1506 */
1547 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1507 if (!ob || ob->face == blank_face)
1548 smoothlevel = 0; 1508 smoothlevel = 0;
1549 else 1509 else
1550 { 1510 {
1551 smoothlevel = ob->smoothlevel; 1511 smoothlevel = ob->smoothlevel;
1552 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1625 uint8 extendedinfos; 1585 uint8 extendedinfos;
1626 maptile *m; 1586 maptile *m;
1627 1587
1628 client &socket = *pl->contr->ns; 1588 client &socket = *pl->contr->ns;
1629 1589
1590 if (!pl->active)
1591 return;
1592
1630 check_map_change (pl->contr); 1593 check_map_change (pl->contr);
1631 1594
1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1633 packet esl; 1596 packet esl;
1634 1597
… …
1754 map_clearcell (&lastcell, 0, 0, 0, -1); 1717 map_clearcell (&lastcell, 0, 0, 0, -1);
1755 } 1718 }
1756 } 1719 }
1757 else if (d > 3) 1720 else if (d > 3)
1758 { 1721 {
1722 m->touch ();
1723
1759 int need_send = 0, count; 1724 int need_send = 0, count;
1760 1725
1761 /* This block deals with spaces that are not visible for whatever 1726 /* This block deals with spaces that are not visible for whatever
1762 * reason. Still may need to send the head for this space. 1727 * reason. Still may need to send the head for this space.
1763 */ 1728 */
… …
1796 else 1761 else
1797 sl.reset (oldlen); 1762 sl.reset (oldlen);
1798 } 1763 }
1799 else 1764 else
1800 { 1765 {
1766 m->touch ();
1767
1801 /* In this block, the space is visible or there are head objects 1768 /* In this block, the space is visible or there are head objects
1802 * we need to send. 1769 * we need to send.
1803 */ 1770 */
1804 1771
1805 /* Rather than try to figure out what everything that we might 1772 /* Rather than try to figure out what everything that we might
… …
2120 * it then sends an updspell packet for each spell that has changed in this way 2087 * it then sends an updspell packet for each spell that has changed in this way
2121 */ 2088 */
2122void 2089void
2123esrv_update_spells (player *pl) 2090esrv_update_spells (player *pl)
2124{ 2091{
2092 if (!pl->ns)
2093 return;
2094
2125 if (!pl->ns->monitor_spells) 2095 if (!pl->ns->monitor_spells)
2126 return; 2096 return;
2127 2097
2128 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2098 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2129 { 2099 {

Diff Legend

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