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.57 by root, Thu Jan 4 00:08:08 2007 UTC

… …
176 flags |= 4; 176 flags |= 4;
177 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
178 flags |= 8; 178 flags |= 8;
179 179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 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); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 182 }
183 else 183 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
185 185
186 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
334 if (map->tile_path[2]) 334 if (map->tile_path[2])
335 flags |= 4; 335 flags |= 4;
336 if (map->tile_path[3]) 336 if (map->tile_path[3])
337 flags |= 8; 337 flags |= 8;
338 338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 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 } 340 }
341 else 341 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 343 }
344 else 344 else
… …
399 { 399 {
400 ns->sound = atoi (param); 400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 402 }
403 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
409 { 406 {
410 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 409 }
… …
569 * it either has to be here or init_sockets needs to be exported. 566 * it either has to be here or init_sockets needs to be exported.
570 */ 567 */
571void 568void
572AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
573{ 570{
574 if (INVOKE_CLIENT (ADDME, ns)) 571 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} 572}
582 573
583/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
584void 575void
585ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
850 { 841 {
851 case ST_PLAYING: 842 case ST_PLAYING:
852 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
853 break; 844 break;
854 845
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: 846 case ST_CHANGE_CLASS:
867 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
868 break; 848 break;
869 849
870 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
871 key_confirm_quit (pl->ob, buf[0]); 851 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; 852 break;
887 853
888 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
889 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
890 break; 856 break;
… …
948{ 914{
949 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
950} 916}
951 917
952/** client wants the map resent */ 918/** client wants the map resent */
953
954void 919void
955MapRedrawCmd (char *buf, int len, player *pl) 920MapRedrawCmd (char *buf, int len, player *pl)
956{ 921{
957/* This function is currently disabled; just clearing the map state results in 922/* 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. 923 * display errors. It should clear the cache and send a newmap command.
… …
1044void 1009void
1045esrv_update_stats (player *pl) 1010esrv_update_stats (player *pl)
1046{ 1011{
1047 char buf[MAX_BUF]; 1012 char buf[MAX_BUF];
1048 uint16 flags; 1013 uint16 flags;
1014
1015 if (!pl->ns)
1016 return;
1049 1017
1050 packet sl ("stats"); 1018 packet sl ("stats");
1051 1019
1052 if (pl->ob) 1020 if (pl->ob)
1053 { 1021 {
… …
1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 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); 1025 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); 1026 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); 1027 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); 1028 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); 1029 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); 1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1033 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); 1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1067 } 1035 }
1068 1036
1069 if (pl->ns->exp64)
1070 for (int s = 0; s < NUM_SKILLS; s++) 1037 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) 1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1072 { 1039 {
1073 /* Always send along the level if exp changes. This is only 1040 /* Always send along the level if exp changes. This is only
1074 * 1 extra byte, but keeps processing simpler. 1041 * 1 extra byte, but keeps processing simpler.
1075 */ 1042 */
1076 sl << uint8 (s + CS_STAT_SKILLINFO) 1043 sl << uint8 (s + CS_STAT_SKILLINFO)
1077 << uint8 (pl->last_skill_ob[s]->level) 1044 << uint8 (pl->last_skill_ob[s]->level)
1078 << uint64 (pl->last_skill_ob[s]->stats.exp); 1045 << uint64 (pl->last_skill_ob[s]->stats.exp);
1079 1046
1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1081 } 1048 }
1082 1049
1083 if (pl->ns->exp64)
1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 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); 1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1089 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 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); 1053 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); 1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1092 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1542 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1543 1506
1544 /* If there is no object for this space, or if the face for the object 1507 /* 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. 1508 * is the blank face, set the smoothlevel to zero.
1546 */ 1509 */
1547 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1548 smoothlevel = 0; 1511 smoothlevel = 0;
1549 else 1512 else
1550 { 1513 {
1551 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1552 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
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