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.46 by root, Tue Dec 19 05:12:52 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
… …
138} 139}
139 140
140static void 141static void
141clear_map (player *pl) 142clear_map (player *pl)
142{ 143{
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 145
145 if (pl->socket->newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
147 148
148 pl->socket->floorbox_reset (); 149 pl->ns->floorbox_reset ();
149} 150}
150 151
151/** check for map change and send new map data */ 152/** check for map change and send new map data */
152static void 153static void
153check_map_change (player *pl) 154check_map_change (player *pl)
154{ 155{
155 client &socket = *pl->socket; 156 client &socket = *pl->ns;
156 object *ob = pl->ob; 157 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
158 159
159 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
160 { 161 {
… …
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);
… …
280 buf += 8; 281 buf += 8;
281 282
282 // initial map and its origin 283 // initial map and its origin
283 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
284 sint16 dx, dy; 285 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
288 289
289 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
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
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 347
347 pl->socket->send_packet (bigbuf); 348 pl->ns->send_packet (bigbuf);
348} 349}
349 350
350/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
351void 352void
352SetUp (char *buf, int len, client * ns) 353SetUp (char *buf, int len, client * ns)
… …
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 (ns->status != Ns_Add || add_player (ns)) 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 ns->send_packet ("addme_failed");
576 else
577 ns->send_packet ("addme_success");
578} 573}
579 574
580/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
581void 576void
582ToggleExtendedInfos (char *buf, int len, client * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
… …
719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720 esrv_send_face (ns, smoothface, 0); 715 esrv_send_face (ns, smoothface, 0);
721 716
722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
723 718
724 packet sl; 719 packet sl ("smooth");
725 720
726 sl << "smooth "
727 << uint16 (face) 721 sl << uint16 (face)
728 << uint16 (smoothface); 722 << uint16 (smoothface);
729 723
730 ns->send_packet (sl); 724 ns->send_packet (sl);
731} 725}
732 726
… …
809 int time = FABS (pl->ob->speed) < 0.001 803 int time = FABS (pl->ob->speed) < 0.001
810 ? time = MAX_TIME * 100 804 ? time = MAX_TIME * 100
811 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
812 806
813 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
814 packet sl; 808 packet sl ("comc");
815 sl << "comc " << uint16 (cmdid) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
816 pl->socket->send_packet (sl); 810 pl->ns->send_packet (sl);
817} 811}
818
819 812
820/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
821void 814void
822ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
823{ 816{
817 if (ns->state == ST_CUSTOM)
818 {
819 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
820 return;
821 }
822
823 if (!ns->pl)
824 return; //TODO: depends on the exact reply we are after
825 //TODO: but right now, we always have a ns->pl
826
827 player *pl = ns->pl;
828
824 /* This is to synthesize how the data would be stored if it 829 /* This is to synthesize how the data would be stored if it
825 * was normally entered. A bit of a hack, and should be cleaned up 830 * was normally entered. A bit of a hack, and should be cleaned up
826 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
827 * 832 *
828 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
… …
831 */ 836 */
832 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
833 838
834 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
835 840
836 switch (pl->state) 841 switch (ns->state)
837 { 842 {
838 case ST_PLAYING: 843 case ST_PLAYING:
839 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
840 break; 845 break;
841 846
842 case ST_PLAY_AGAIN:
843 /* We can check this for return value (2==quit). Maybe we
844 * should, and do something appropriate?
845 */
846 receive_play_again (pl->ob, buf[0]);
847 break;
848
849 case ST_ROLL_STAT:
850 key_roll_stat (pl->ob, buf[0]);
851 break;
852
853 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
854
855 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
856 break;
857
858 case ST_CONFIRM_QUIT:
859 key_confirm_quit (pl->ob, buf[0]);
860 break;
861
862 case ST_CONFIGURE:
863 LOG (llevError, "In client input handling, but into configure state\n");
864 pl->state = ST_PLAYING;
865 break;
866
867 case ST_GET_NAME:
868 receive_player_name (pl->ob, 13);
869 break;
870
871 case ST_GET_PASSWORD:
872 case ST_CONFIRM_PASSWORD:
873 receive_player_password (pl->ob, 13);
874 break; 849 break;
875 850
876 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
877 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
878 break; 853 break;
879 854
880 default: 855 default:
881 LOG (llevError, "Unknown input state: %d\n", pl->state); 856 LOG (llevError, "Unknown input state: %d\n", ns->state);
882 } 857 }
883} 858}
884 859
885/** 860/**
886 * Client tells its version. If there is a mismatch, we close the 861 * Client tells its version. If there is a mismatch, we close the
… …
936{ 911{
937 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
938} 913}
939 914
940/** client wants the map resent */ 915/** client wants the map resent */
941
942void 916void
943MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
944{ 918{
945/* 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
946 * 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.
… …
1033esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1034{ 1008{
1035 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1036 uint16 flags; 1010 uint16 flags;
1037 1011
1038 packet sl; 1012 if (!pl->ns)
1039 sl << "stats "; 1013 return;
1014
1015 packet sl ("stats");
1040 1016
1041 if (pl->ob) 1017 if (pl->ob)
1042 { 1018 {
1043 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1044 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1045 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);
1046 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);
1047 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);
1048 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);
1049 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);
1050 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1051 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1052 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1053 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);
1054 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);
1055 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);
1056 } 1032 }
1057 1033
1058 if (pl->socket->exp64)
1059 for (int s = 0; s < NUM_SKILLS; s++) 1034 for (int s = 0; s < NUM_SKILLS; s++)
1060 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)
1061 { 1036 {
1062 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1063 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1064 */ 1039 */
1065 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1066 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (pl->last_skill_ob[s]->level)
1067 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (pl->last_skill_ob[s]->stats.exp);
1068 1043
1069 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;
1070 } 1045 }
1071 1046
1072 if (pl->socket->exp64)
1073 { 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);
1074 else
1075 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1076
1077 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1078 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);
1079 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);
1080 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);
1081 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1090 if (pl->run_on) 1061 if (pl->run_on)
1091 flags |= SF_RUNON; 1062 flags |= SF_RUNON;
1092 1063
1093 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1094 1065
1095 if (pl->socket->sc_version < 1025) 1066 if (pl->ns->sc_version < 1025)
1096 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1067 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1097 else 1068 else
1098 for (int i = 0; i < NROFATTACKS; i++) 1069 for (int i = 0; i < NROFATTACKS; i++)
1099 { 1070 {
1100 /* Skip ones we won't send */ 1071 /* Skip ones we won't send */
… …
1102 continue; 1073 continue;
1103 1074
1104 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1075 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1105 } 1076 }
1106 1077
1107 if (pl->socket->monitor_spells) 1078 if (pl->ns->monitor_spells)
1108 { 1079 {
1109 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1080 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1110 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1081 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1111 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1082 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1112 } 1083 }
1113 1084
1114 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1085 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1115 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1116 set_title (pl->ob, buf); 1087 set_title (pl->ob, buf);
1117 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1118 1089
1119 /* Only send it away if we have some actual data */ 1090 /* Only send it away if we have some actual data */
1120 if (sl.length () > 6) 1091 if (sl.length () > 6)
1121 pl->socket->send_packet (sl); 1092 pl->ns->send_packet (sl);
1122} 1093}
1123 1094
1124/** 1095/**
1125 * Tells the client that here is a player it should start using. 1096 * Tells the client that here is a player it should start using.
1126 */ 1097 */
1127void 1098void
1128esrv_new_player (player *pl, uint32 weight) 1099esrv_new_player (player *pl, uint32 weight)
1129{ 1100{
1130 pl->last_weight = weight; 1101 pl->last_weight = weight;
1131 1102
1132 packet sl; 1103 packet sl ("player");
1133 sl << "player ";
1134 1104
1135 sl << uint32 (pl->ob->count) 1105 sl << uint32 (pl->ob->count)
1136 << uint32 (weight) 1106 << uint32 (weight)
1137 << uint32 (pl->ob->face->number) 1107 << uint32 (pl->ob->face->number)
1138 << data8 (pl->ob->name); 1108 << data8 (pl->ob->name);
1139 1109
1140 pl->socket->send_packet (sl); 1110 pl->ns->send_packet (sl);
1141 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1142} 1112}
1143 1113
1144/** 1114/**
1145 * Need to send an animation sequence to the client. 1115 * Need to send an animation sequence to the client.
… …
1159 { 1129 {
1160 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1130 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1161 return; 1131 return;
1162 } 1132 }
1163 1133
1164 packet sl; 1134 packet sl ("anim");
1165 1135
1166 sl << "anim "
1167 << uint16 (anim_num) 1136 sl << uint16 (anim_num)
1168 << uint16 (0); /* flags - not used right now */ 1137 << uint16 (0); /* flags - not used right now */
1169 1138
1170 /* Build up the list of faces. Also, send any information (ie, the 1139 /* Build up the list of faces. Also, send any information (ie, the
1171 * the face itself) down to the client. 1140 * the face itself) down to the client.
1172 */ 1141 */
… …
1533 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1502 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1534 1503
1535 /* 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
1536 * is the blank face, set the smoothlevel to zero. 1505 * is the blank face, set the smoothlevel to zero.
1537 */ 1506 */
1538 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1507 if (!ob || ob->face == blank_face)
1539 smoothlevel = 0; 1508 smoothlevel = 0;
1540 else 1509 else
1541 { 1510 {
1542 smoothlevel = ob->smoothlevel; 1511 smoothlevel = ob->smoothlevel;
1543 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1593 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1562 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1594 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1563 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1595 * and use the other 4 bits for other informatiion. For full documentation 1564 * and use the other 4 bits for other informatiion. For full documentation
1596 * of what we send, see the doc/Protocol file. 1565 * of what we send, see the doc/Protocol file.
1597 * I will describe internally what we do: 1566 * I will describe internally what we do:
1598 * the socket->lastmap shows how the map last looked when sent to the client. 1567 * the ns->lastmap shows how the map last looked when sent to the client.
1599 * in the lastmap structure, there is a cells array, which is set to the 1568 * in the lastmap structure, there is a cells array, which is set to the
1600 * maximum viewable size (As set in config.h). 1569 * maximum viewable size (As set in config.h).
1601 * in the cells, there are faces and a count value. 1570 * in the cells, there are faces and a count value.
1602 * we use the count value to hold the darkness value. If -1, then this space 1571 * we use the count value to hold the darkness value. If -1, then this space
1603 * is not viewable. 1572 * is not viewable.
… …
1614 uint8 eentrysize; 1583 uint8 eentrysize;
1615 uint16 ewhatstart, ewhatflag; 1584 uint16 ewhatstart, ewhatflag;
1616 uint8 extendedinfos; 1585 uint8 extendedinfos;
1617 maptile *m; 1586 maptile *m;
1618 1587
1619 client &socket = *pl->contr->socket; 1588 client &socket = *pl->contr->ns;
1589
1590 if (!pl->active)
1591 return;
1620 1592
1621 check_map_change (pl->contr); 1593 check_map_change (pl->contr);
1622 1594
1623 packet sl; 1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1624 packet esl; 1596 packet esl;
1625 1597
1626 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1627 startlen = sl.length (); 1598 startlen = sl.length ();
1628 1599
1629 /*Extendedmapinfo structure initialisation */ 1600 /*Extendedmapinfo structure initialisation */
1630 if (socket.ext_mapinfos) 1601 if (socket.ext_mapinfos)
1631 { 1602 {
… …
1675 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1646 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1676 { 1647 {
1677 ax = 0; 1648 ax = 0;
1678 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1649 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1679 { 1650 {
1680
1681 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1682 1652
1683 /* If this space is out of the normal viewable area, we only check 1653 /* If this space is out of the normal viewable area, we only check
1684 * the heads value ax or ay will only be greater than what 1654 * the heads value ax or ay will only be greater than what
1685 * the client wants if using the map1a command - this is because 1655 * the client wants if using the map1a command - this is because
… …
1747 map_clearcell (&lastcell, 0, 0, 0, -1); 1717 map_clearcell (&lastcell, 0, 0, 0, -1);
1748 } 1718 }
1749 } 1719 }
1750 else if (d > 3) 1720 else if (d > 3)
1751 { 1721 {
1722 m->touch ();
1723
1752 int need_send = 0, count; 1724 int need_send = 0, count;
1753 1725
1754 /* This block deals with spaces that are not visible for whatever 1726 /* This block deals with spaces that are not visible for whatever
1755 * reason. Still may need to send the head for this space. 1727 * reason. Still may need to send the head for this space.
1756 */ 1728 */
… …
1789 else 1761 else
1790 sl.reset (oldlen); 1762 sl.reset (oldlen);
1791 } 1763 }
1792 else 1764 else
1793 { 1765 {
1766 m->touch ();
1767
1794 /* 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
1795 * we need to send. 1769 * we need to send.
1796 */ 1770 */
1797 1771
1798 /* Rather than try to figure out what everything that we might 1772 /* Rather than try to figure out what everything that we might
… …
2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1989 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2016 return; 1990 return;
2017 1991
2018 memset (&newmap, 0, sizeof (struct Map)); 1992 memset (&newmap, 0, sizeof (struct Map));
2019 1993
2020 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1994 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2021 {
2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1995 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023 { 1996 {
2024 ax = i; 1997 ax = i;
2025 ay = j; 1998 ay = j;
2026 m = pm; 1999 m = pm;
2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2000 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028 2001
2029 if (mflags & P_OUT_OF_MAP) 2002 if (mflags & P_OUT_OF_MAP)
2030 continue; 2003 continue;
2031 2004
2032 if (mflags & P_NEED_UPDATE)
2033 update_position (m, ax, ay);
2034
2035 /* If a map is visible to the player, we don't want to swap it out 2005 /* If a map is visible to the player, we don't want to swap it out
2036 * just to reload it. This should really call something like 2006 * just to reload it. This should really call something like
2037 * swap_map, but this is much more efficient and 'good enough' 2007 * swap_map, but this is much more efficient and 'good enough'
2038 */ 2008 */
2039 if (mflags & P_NEW_MAP) 2009 if (mflags & P_NEW_MAP)
2040 m->timeout = 50; 2010 m->timeout = 50;
2041 } 2011 }
2042 } 2012
2043 /* do LOS after calls to update_position */ 2013 /* do LOS after calls to update_position */
2044 if (pl->contr->do_los) 2014 if (pl->contr->do_los)
2045 { 2015 {
2046 update_los (pl); 2016 update_los (pl);
2047 pl->contr->do_los = 0; 2017 pl->contr->do_los = 0;
… …
2062 2032
2063/*****************************************************************************/ 2033/*****************************************************************************/
2064void 2034void
2065send_plugin_custom_message (object *pl, char *buf) 2035send_plugin_custom_message (object *pl, char *buf)
2066{ 2036{
2067 pl->contr->socket->send_packet (buf); 2037 pl->contr->ns->send_packet (buf);
2068} 2038}
2069 2039
2070/** 2040/**
2071 * This sends the skill number to name mapping. We ignore 2041 * This sends the skill number to name mapping. We ignore
2072 * the params - we always send the same info no matter what. 2042 * the params - we always send the same info no matter what.
… …
2117 * 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
2118 */ 2088 */
2119void 2089void
2120esrv_update_spells (player *pl) 2090esrv_update_spells (player *pl)
2121{ 2091{
2092 if (!pl->ns)
2093 return;
2094
2122 if (!pl->socket->monitor_spells) 2095 if (!pl->ns->monitor_spells)
2123 return; 2096 return;
2124 2097
2125 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2098 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2126 { 2099 {
2127 if (spell->type == SPELL) 2100 if (spell->type == SPELL)
… …
2157 2130
2158 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2131 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2159 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2132 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2160 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2133 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2161 2134
2162 pl->socket->send_packet (sl); 2135 pl->ns->send_packet (sl);
2163 } 2136 }
2164 } 2137 }
2165 } 2138 }
2166} 2139}
2167 2140
2168void 2141void
2169esrv_remove_spell (player *pl, object *spell) 2142esrv_remove_spell (player *pl, object *spell)
2170{ 2143{
2171 if (!pl->socket->monitor_spells) 2144 if (!pl->ns->monitor_spells)
2172 return; 2145 return;
2173 2146
2174 if (!pl || !spell || spell->env != pl->ob) 2147 if (!pl || !spell || spell->env != pl->ob)
2175 { 2148 {
2176 LOG (llevError, "Invalid call to esrv_remove_spell"); 2149 LOG (llevError, "Invalid call to esrv_remove_spell");
2177 return; 2150 return;
2178 } 2151 }
2179 2152
2180 packet sl; 2153 packet sl ("delspell");
2181 2154
2182 sl << "delspell "
2183 << uint32 (spell->count); 2155 sl << uint32 (spell->count);
2184 2156
2185 pl->socket->send_packet (sl); 2157 pl->ns->send_packet (sl);
2186} 2158}
2187 2159
2188/* appends the spell *spell to the Socklist we will send the data to. */ 2160/* appends the spell *spell to the Socklist we will send the data to. */
2189static void 2161static void
2190append_spell (player *pl, packet &sl, object *spell) 2162append_spell (player *pl, packet &sl, object *spell)
… …
2238 { 2210 {
2239 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2211 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2240 return; 2212 return;
2241 } 2213 }
2242 2214
2243 if (!pl->socket->monitor_spells) 2215 if (!pl->ns->monitor_spells)
2244 return; 2216 return;
2245 2217
2246 packet sl; 2218 packet sl ("addspell");
2247 sl << "addspell ";
2248 2219
2249 if (!spell) 2220 if (!spell)
2250 { 2221 {
2251 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2252 { 2223 {
… …
2266 if (spell->type != SPELL) 2237 if (spell->type != SPELL)
2267 continue; 2238 continue;
2268 2239
2269 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2240 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2270 { 2241 {
2271 pl->socket->send_packet (sl); 2242 pl->ns->send_packet (sl);
2272 2243
2273 sl.reset (); 2244 sl.reset ();
2274 sl << "addspell "; 2245 sl << "addspell ";
2275 } 2246 }
2276 2247
… …
2290 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2261 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2291 fatal (0); 2262 fatal (0);
2292 } 2263 }
2293 2264
2294 /* finally, we can send the packet */ 2265 /* finally, we can send the packet */
2295 pl->socket->send_packet (sl); 2266 pl->ns->send_packet (sl);
2296} 2267}
2297 2268

Diff Legend

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