… | |
… | |
57 | #include <commands.h> |
57 | #include <commands.h> |
58 | |
58 | |
59 | /* This block is basically taken from socket.c - I assume if it works there, |
59 | /* This block is basically taken from socket.c - I assume if it works there, |
60 | * it should work here. |
60 | * it should work here. |
61 | */ |
61 | */ |
62 | #ifndef WIN32 /* ---win32 exclude unix headers */ |
|
|
63 | # include <sys/types.h> |
62 | #include <sys/types.h> |
64 | # include <sys/time.h> |
63 | #include <sys/time.h> |
65 | # include <sys/socket.h> |
64 | #include <sys/socket.h> |
66 | # include <netinet/in.h> |
65 | #include <netinet/in.h> |
67 | # include <netdb.h> |
66 | #include <netdb.h> |
68 | #endif /* win32 */ |
|
|
69 | |
67 | |
70 | #ifdef HAVE_UNISTD_H |
68 | #ifdef HAVE_UNISTD_H |
71 | # include <unistd.h> |
69 | # include <unistd.h> |
72 | #endif |
70 | #endif |
73 | |
71 | |
… | |
… | |
137 | for (x = 0; x < mx; x++) |
135 | for (x = 0; x < mx; x++) |
138 | { |
136 | { |
139 | for (y = 0; y < my; y++) |
137 | for (y = 0; y < my; y++) |
140 | { |
138 | { |
141 | if (x >= ns->mapx || y >= ns->mapy) |
139 | if (x >= ns->mapx || y >= ns->mapy) |
142 | { |
|
|
143 | /* clear cells outside the viewable area */ |
140 | /* clear cells outside the viewable area */ |
144 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
141 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
145 | } |
|
|
146 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
142 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
147 | { |
|
|
148 | /* clear newly visible tiles within the viewable area */ |
143 | /* clear newly visible tiles within the viewable area */ |
149 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
144 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
150 | } |
|
|
151 | else |
145 | else |
152 | { |
|
|
153 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
146 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
154 | } |
|
|
155 | } |
147 | } |
156 | } |
148 | } |
157 | |
149 | |
158 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
150 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
159 | |
151 | |
… | |
… | |
690 | */ |
682 | */ |
691 | static void |
683 | static void |
692 | SendSmooth (NewSocket * ns, uint16 face) |
684 | SendSmooth (NewSocket * ns, uint16 face) |
693 | { |
685 | { |
694 | uint16 smoothface; |
686 | uint16 smoothface; |
695 | unsigned char reply[MAX_BUF]; |
|
|
696 | SockList sl; |
|
|
697 | |
687 | |
698 | /* If we can't find a face, return and set it so we won't try to send this |
688 | /* If we can't find a face, return and set it so we won't try to send this |
699 | * again. |
689 | * again. |
700 | */ |
690 | */ |
701 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
691 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
… | |
… | |
709 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
699 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
710 | esrv_send_face (ns, smoothface, 0); |
700 | esrv_send_face (ns, smoothface, 0); |
711 | |
701 | |
712 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
702 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
713 | |
703 | |
714 | sl.buf = reply; |
704 | SockList sl (MAXSOCKBUF); |
715 | strcpy ((char *) sl.buf, "smooth "); |
705 | |
716 | sl.len = strlen ((char *) sl.buf); |
706 | sl << "smooth " |
717 | SockList_AddShort (&sl, face); |
707 | << uint16 (face) |
718 | SockList_AddShort (&sl, smoothface); |
708 | << uint16 (smoothface); |
|
|
709 | |
719 | Send_With_Handling (ns, &sl); |
710 | Send_With_Handling (ns, &sl); |
|
|
711 | sl.free (); |
720 | } |
712 | } |
721 | |
713 | |
722 | /** |
714 | /** |
723 | * Tells client the picture it has to use |
715 | * Tells client the picture it has to use |
724 | * to smooth a picture number given as argument. |
716 | * to smooth a picture number given as argument. |
… | |
… | |
730 | |
722 | |
731 | facenbr = atoi (buf); |
723 | facenbr = atoi (buf); |
732 | SendSmooth (ns, facenbr); |
724 | SendSmooth (ns, facenbr); |
733 | } |
725 | } |
734 | |
726 | |
735 | |
|
|
736 | |
|
|
737 | |
|
|
738 | |
|
|
739 | /** |
727 | /** |
740 | * This handles the general commands from the client (ie, north, fire, cast, |
728 | * This handles the general commands from the client (ie, north, fire, cast, |
741 | * etc.) |
729 | * etc.) |
742 | */ |
730 | */ |
743 | void |
731 | void |
… | |
… | |
796 | */ |
784 | */ |
797 | void |
785 | void |
798 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
786 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
799 | { |
787 | { |
800 | int time, repeat; |
788 | int time, repeat; |
|
|
789 | char command[MAX_BUF]; |
801 | short packet; |
790 | short packet; |
802 | unsigned char command[MAX_BUF]; |
|
|
803 | SockList sl; |
|
|
804 | |
791 | |
805 | if (len < 7) |
792 | if (len < 7) |
806 | { |
793 | { |
807 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
794 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
808 | return; |
795 | return; |
809 | } |
796 | } |
810 | |
797 | |
811 | packet = GetShort_String (buf); |
798 | packet = net_uint16 (buf); |
812 | repeat = GetInt_String (buf + 2); |
799 | repeat = net_uint32 (buf + 2); |
|
|
800 | |
813 | /* -1 is special - no repeat, but don't update */ |
801 | /* -1 is special - no repeat, but don't update */ |
814 | if (repeat != -1) |
802 | if (repeat != -1) |
815 | { |
|
|
816 | pl->count = repeat; |
803 | pl->count = repeat; |
817 | } |
804 | |
818 | if ((len - 4) >= MAX_BUF) |
805 | if ((len - 4) >= MAX_BUF) |
819 | len = MAX_BUF - 5; |
806 | len = MAX_BUF - 5; |
820 | |
807 | |
821 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
808 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
822 | command[len - 4] = '\0'; |
809 | command[len - 4] = '\0'; |
… | |
… | |
832 | return; |
819 | return; |
833 | } |
820 | } |
834 | |
821 | |
835 | /* This should not happen anymore. */ |
822 | /* This should not happen anymore. */ |
836 | if (pl->ob->speed_left < -1.0) |
823 | if (pl->ob->speed_left < -1.0) |
837 | { |
|
|
838 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
824 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
839 | } |
825 | |
840 | /* In c_new.c */ |
826 | /* In c_new.c */ |
841 | execute_newserver_command (pl->ob, (char *) command); |
827 | execute_newserver_command (pl->ob, (char *) command); |
842 | /* Perhaps something better should be done with a left over count. |
828 | /* Perhaps something better should be done with a left over count. |
843 | * Cleaning up the input should probably be done first - all actions |
829 | * Cleaning up the input should probably be done first - all actions |
844 | * for the command that issued the count should be done before any other |
830 | * for the command that issued the count should be done before any other |
845 | * commands. |
831 | * commands. |
846 | */ |
832 | */ |
847 | pl->count = 0; |
833 | pl->count = 0; |
848 | |
834 | |
849 | /* Send confirmation of command execution now */ |
|
|
850 | sl.buf = command; |
|
|
851 | strcpy ((char *) sl.buf, "comc "); |
|
|
852 | sl.len = 5; |
|
|
853 | SockList_AddShort (&sl, packet); |
|
|
854 | if (FABS (pl->ob->speed) < 0.001) |
835 | if (FABS (pl->ob->speed) < 0.001) |
855 | time = MAX_TIME * 100; |
836 | time = MAX_TIME * 100; |
856 | else |
837 | else |
857 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
838 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
858 | SockList_AddInt (&sl, time); |
839 | |
|
|
840 | /* Send confirmation of command execution now */ |
|
|
841 | |
|
|
842 | SockList sl (MAXSOCKBUF); |
|
|
843 | sl << "comc " << uint16 (packet) << uint32 (time); |
859 | Send_With_Handling (&pl->socket, &sl); |
844 | Send_With_Handling (&pl->socket, &sl); |
|
|
845 | sl.free (); |
860 | } |
846 | } |
861 | |
847 | |
862 | |
848 | |
863 | /** This is a reply to a previous query. */ |
849 | /** This is a reply to a previous query. */ |
864 | void |
850 | void |
… | |
… | |
976 | /* these are old dxclients */ |
962 | /* these are old dxclients */ |
977 | /* Version 1024 added support for singular + plural name values - |
963 | /* Version 1024 added support for singular + plural name values - |
978 | * requiing this minimal value reduces complexity of that code, and it |
964 | * requiing this minimal value reduces complexity of that code, and it |
979 | * has been around for a long time. |
965 | * has been around for a long time. |
980 | */ |
966 | */ |
981 | if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) |
967 | if (ns->sc_version < 1026) |
982 | { |
968 | { |
983 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
969 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
984 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
970 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
985 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
971 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
986 | } |
972 | } |
… | |
… | |
1067 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1053 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1068 | } |
1054 | } |
1069 | |
1055 | |
1070 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1056 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1071 | Old = New; \ |
1057 | Old = New; \ |
1072 | SockList_AddChar(&sl, Type); \ |
1058 | sl << uint8 (Type) << uint64 (New); \ |
1073 | SockList_AddInt64(&sl, New); \ |
|
|
1074 | } |
1059 | } |
1075 | |
1060 | |
1076 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1061 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
1062 | Old = New; \ |
1078 | SockList_AddChar(&sl, Type); \ |
1063 | sl << uint8 (Type) << uint32 (New); \ |
1079 | SockList_AddInt(&sl, New); \ |
|
|
1080 | } |
1064 | } |
1081 | |
1065 | |
1082 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1066 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1083 | Old = New; \ |
1067 | Old = New; \ |
1084 | SockList_AddChar(&sl, Type); \ |
1068 | sl << uint8 (Type) << uint16 (New); \ |
1085 | SockList_AddShort(&sl, New); \ |
|
|
1086 | } |
1069 | } |
1087 | |
1070 | |
1088 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1071 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1089 | Old = New; \ |
1072 | Old = New; \ |
1090 | SockList_AddChar(&sl, Type); \ |
1073 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
1091 | SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ |
|
|
1092 | } |
1074 | } |
1093 | |
1075 | |
1094 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1076 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1095 | if (Old) free(Old);\ |
|
|
1096 | Old = strdup_local(New);\ |
1077 | free(Old); Old = strdup (New);\ |
1097 | SockList_AddChar(&sl, Type); \ |
1078 | sl << uint8 (Type) << data8 (New); \ |
1098 | SockList_AddChar(&sl, ( char )strlen(New)); \ |
|
|
1099 | strcpy((char*)sl.buf + sl.len, New); \ |
|
|
1100 | sl.len += strlen(New); \ |
|
|
1101 | } |
1079 | } |
1102 | |
1080 | |
1103 | /** |
1081 | /** |
1104 | * Sends a statistics update. We look at the old values, |
1082 | * Sends a statistics update. We look at the old values, |
1105 | * and only send what has changed. Stat mapping values are in newclient.h |
1083 | * and only send what has changed. Stat mapping values are in newclient.h |
… | |
… | |
1107 | * commands for now. |
1085 | * commands for now. |
1108 | */ |
1086 | */ |
1109 | void |
1087 | void |
1110 | esrv_update_stats (player *pl) |
1088 | esrv_update_stats (player *pl) |
1111 | { |
1089 | { |
1112 | SockList sl; |
|
|
1113 | char buf[MAX_BUF]; |
1090 | char buf[MAX_BUF]; |
1114 | uint16 flags; |
1091 | uint16 flags; |
1115 | |
1092 | |
1116 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1093 | SockList sl (MAXSOCKBUF); |
1117 | strcpy ((char *) sl.buf, "stats "); |
1094 | sl << "stats "; |
1118 | sl.len = strlen ((char *) sl.buf); |
|
|
1119 | |
1095 | |
1120 | if (pl->ob != NULL) |
1096 | if (pl->ob != NULL) |
1121 | { |
1097 | { |
1122 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1098 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1123 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1099 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
1140 | |
1116 | |
1141 | for (s = 0; s < NUM_SKILLS; s++) |
1117 | for (s = 0; s < NUM_SKILLS; s++) |
1142 | { |
1118 | { |
1143 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1119 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1144 | { |
1120 | { |
1145 | |
|
|
1146 | /* Always send along the level if exp changes. This is only |
1121 | /* Always send along the level if exp changes. This is only |
1147 | * 1 extra byte, but keeps processing simpler. |
1122 | * 1 extra byte, but keeps processing simpler. |
1148 | */ |
1123 | */ |
1149 | SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); |
1124 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1150 | SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); |
1125 | << uint8 (pl->last_skill_ob[s]->level) |
1151 | SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); |
1126 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
|
|
1127 | |
1152 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1128 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1153 | } |
1129 | } |
1154 | } |
1130 | } |
1155 | } |
1131 | } |
1156 | |
1132 | |
… | |
… | |
1212 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1188 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1213 | #endif |
1189 | #endif |
1214 | Send_With_Handling (&pl->socket, &sl); |
1190 | Send_With_Handling (&pl->socket, &sl); |
1215 | } |
1191 | } |
1216 | |
1192 | |
1217 | free (sl.buf); |
1193 | sl.free (); |
1218 | } |
1194 | } |
1219 | |
1195 | |
1220 | /** |
1196 | /** |
1221 | * Tells the client that here is a player it should start using. |
1197 | * Tells the client that here is a player it should start using. |
1222 | */ |
1198 | */ |
1223 | void |
1199 | void |
1224 | esrv_new_player (player *pl, uint32 weight) |
1200 | esrv_new_player (player *pl, uint32 weight) |
1225 | { |
1201 | { |
1226 | SockList sl; |
|
|
1227 | |
|
|
1228 | pl->last_weight = weight; |
1202 | pl->last_weight = weight; |
1229 | |
1203 | |
1230 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1204 | SockList sl (MAXSOCKBUF); |
|
|
1205 | sl << "player "; |
1231 | |
1206 | |
1232 | strcpy ((char *) sl.buf, "player "); |
1207 | sl << uint32 (pl->ob->count) |
1233 | sl.len = strlen ((char *) sl.buf); |
1208 | << uint32 (weight) |
1234 | SockList_AddInt (&sl, pl->ob->count); |
1209 | << uint32 (pl->ob->face->number) |
1235 | SockList_AddInt (&sl, weight); |
1210 | << data8 (pl->ob->name); |
1236 | SockList_AddInt (&sl, pl->ob->face->number); |
|
|
1237 | |
|
|
1238 | SockList_AddChar (&sl, (char) strlen (pl->ob->name)); |
|
|
1239 | strcpy ((char *) sl.buf + sl.len, pl->ob->name); |
|
|
1240 | sl.len += strlen (pl->ob->name); |
|
|
1241 | |
1211 | |
1242 | Send_With_Handling (&pl->socket, &sl); |
1212 | Send_With_Handling (&pl->socket, &sl); |
1243 | free (sl.buf); |
1213 | sl.free (); |
1244 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1214 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1245 | } |
1215 | } |
1246 | |
1216 | |
1247 | /** |
1217 | /** |
1248 | * Need to send an animation sequence to the client. |
1218 | * Need to send an animation sequence to the client. |
… | |
… | |
1252 | * when the player logs in and picks stuff up. |
1222 | * when the player logs in and picks stuff up. |
1253 | */ |
1223 | */ |
1254 | void |
1224 | void |
1255 | esrv_send_animation (NewSocket * ns, short anim_num) |
1225 | esrv_send_animation (NewSocket * ns, short anim_num) |
1256 | { |
1226 | { |
1257 | SockList sl; |
|
|
1258 | int i; |
1227 | int i; |
1259 | |
1228 | |
1260 | /* Do some checking on the anim_num we got. Note that the animations |
1229 | /* Do some checking on the anim_num we got. Note that the animations |
1261 | * are added in contigous order, so if the number is in the valid |
1230 | * are added in contigous order, so if the number is in the valid |
1262 | * range, it must be a valid animation. |
1231 | * range, it must be a valid animation. |
… | |
… | |
1265 | { |
1234 | { |
1266 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1235 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1267 | return; |
1236 | return; |
1268 | } |
1237 | } |
1269 | |
1238 | |
1270 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1239 | SockList sl (MAXSOCKBUF); |
1271 | strcpy ((char *) sl.buf, "anim "); |
1240 | |
1272 | sl.len = 5; |
1241 | sl << "anim " |
1273 | SockList_AddShort (&sl, anim_num); |
1242 | << uint16 (anim_num) |
1274 | SockList_AddShort (&sl, 0); /* flags - not used right now */ |
1243 | << uint16 (0); /* flags - not used right now */ |
|
|
1244 | |
1275 | /* Build up the list of faces. Also, send any information (ie, the |
1245 | /* Build up the list of faces. Also, send any information (ie, the |
1276 | * the face itself) down to the client. |
1246 | * the face itself) down to the client. |
1277 | */ |
1247 | */ |
1278 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1248 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1279 | { |
1249 | { |
1280 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1250 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1281 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1251 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1282 | SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ |
1252 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1283 | } |
1253 | } |
|
|
1254 | |
1284 | Send_With_Handling (ns, &sl); |
1255 | Send_With_Handling (ns, &sl); |
1285 | free (sl.buf); |
1256 | sl.free (); |
|
|
1257 | |
1286 | ns->anims_sent[anim_num] = 1; |
1258 | ns->anims_sent[anim_num] = 1; |
1287 | } |
1259 | } |
1288 | |
1260 | |
1289 | |
1261 | |
1290 | /****************************************************************************** |
1262 | /****************************************************************************** |
… | |
… | |
1304 | { |
1276 | { |
1305 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1277 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1306 | return; |
1278 | return; |
1307 | abort (); |
1279 | abort (); |
1308 | } |
1280 | } |
|
|
1281 | |
1309 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1282 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1310 | newmap->cells[x][y].count++; |
1283 | newmap->cells[x][y].count++; |
|
|
1284 | |
1311 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1285 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1312 | esrv_send_face (ns, face_num, 0); |
1286 | esrv_send_face (ns, face_num, 0); |
1313 | } |
1287 | } |
1314 | |
1288 | |
1315 | struct LayerCell |
1289 | struct LayerCell |
… | |
… | |
1422 | static void |
1396 | static void |
1423 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1397 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1424 | { |
1398 | { |
1425 | static long frames, bytes, tbytes, tframes; |
1399 | static long frames, bytes, tbytes, tframes; |
1426 | char *cur; |
1400 | char *cur; |
1427 | SockList sl; |
|
|
1428 | |
1401 | |
1429 | |
1402 | SockList sl (MAXSOCKBUF); |
1430 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1403 | sl << "map "; |
1431 | strcpy ((char *) sl.buf, "map "); |
|
|
1432 | sl.len = strlen ((char *) sl.buf); |
|
|
1433 | |
1404 | |
1434 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
1405 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
1435 | sl.len = cur - (char *) sl.buf; |
1406 | sl.len = cur - (char *) sl.buf; |
1436 | |
1407 | |
1437 | /* LOG(llevDebug, "Sending map command.\n");*/ |
1408 | /* LOG(llevDebug, "Sending map command.\n");*/ |
… | |
… | |
1449 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1420 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1450 | Send_With_Handling (ns, &sl); |
1421 | Send_With_Handling (ns, &sl); |
1451 | ns->sent_scroll = 0; |
1422 | ns->sent_scroll = 0; |
1452 | } |
1423 | } |
1453 | |
1424 | |
1454 | free (sl.buf); |
1425 | sl.free (); |
1455 | } |
1426 | } |
1456 | |
1427 | |
1457 | |
1428 | |
1458 | /** Clears a map cell */ |
1429 | /** Clears a map cell */ |
1459 | static void |
1430 | static void |
1460 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1431 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1461 | { |
1432 | { |
1462 | cell->faces[0] = face0; |
1433 | cell->faces[0] = face0; |
1463 | cell->faces[1] = face1; |
1434 | cell->faces[1] = face1; |
1464 | cell->faces[2] = face2; |
1435 | cell->faces[2] = face2; |
1465 | cell->count = count; |
1436 | cell->count = count; |
1466 | cell->stat_hp = 0; |
1437 | cell->stat_hp = 0; |
|
|
1438 | cell->flags = 0; |
1467 | cell->player = 0; |
1439 | cell->player = 0; |
1468 | } |
1440 | } |
1469 | |
1441 | |
1470 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
1442 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
1471 | #define MAX_LAYERS 3 |
1443 | #define MAX_LAYERS 3 |
1472 | |
1444 | |
… | |
… | |
1500 | * needs to get sent - if so, it adds the data, sending the head |
1472 | * needs to get sent - if so, it adds the data, sending the head |
1501 | * if needed, and returning 1. If this no data needs to get |
1473 | * if needed, and returning 1. If this no data needs to get |
1502 | * sent, it returns zero. |
1474 | * sent, it returns zero. |
1503 | */ |
1475 | */ |
1504 | static int |
1476 | static int |
1505 | check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) |
1477 | check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) |
1506 | { |
1478 | { |
1507 | short face_num; |
1479 | short face_num; |
1508 | |
1480 | |
1509 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1481 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1510 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1482 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1514 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1486 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1515 | { |
1487 | { |
1516 | SockList_AddShort (&sl, face_num); |
1488 | SockList_AddShort (&sl, face_num); |
1517 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1489 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1518 | esrv_send_face (&ns, face_num, 0); |
1490 | esrv_send_face (&ns, face_num, 0); |
|
|
1491 | |
1519 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1492 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1520 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1493 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1521 | return 1; |
1494 | return 1; |
1522 | } |
1495 | } |
1523 | |
1496 | |
… | |
… | |
1543 | * the case, it seems to make more sense to have these layer values |
1516 | * the case, it seems to make more sense to have these layer values |
1544 | * actually match. |
1517 | * actually match. |
1545 | */ |
1518 | */ |
1546 | |
1519 | |
1547 | static int |
1520 | static int |
1548 | update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1521 | update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1549 | { |
1522 | { |
1550 | object *ob, *head; |
1523 | object *ob, *head; |
1551 | uint16 face_num; |
1524 | uint16 face_num; |
1552 | int bx, by, i; |
1525 | int bx, by, i; |
1553 | |
1526 | |
1554 | /* If there is a multipart object stored away, treat that as more important. |
1527 | /* If there is a multipart object stored away, treat that as more important. |
1555 | * If not, then do the normal processing. |
1528 | * If not, then do the normal processing. |
1556 | */ |
1529 | */ |
1557 | |
|
|
1558 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1530 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1559 | |
1531 | |
1560 | /* Check to see if this head is part of the set of objects |
1532 | /* Check to see if this head is part of the set of objects |
1561 | * we would normally send for this space. If so, then |
1533 | * we would normally send for this space. If so, then |
1562 | * don't use the head value. We need to do the check |
1534 | * don't use the head value. We need to do the check |
… | |
… | |
1727 | |
1699 | |
1728 | /* Another hack - because of heads and whatnot, this face may match one |
1700 | /* Another hack - because of heads and whatnot, this face may match one |
1729 | * we already sent for a lower layer. In that case, don't send |
1701 | * we already sent for a lower layer. In that case, don't send |
1730 | * this one. |
1702 | * this one. |
1731 | */ |
1703 | */ |
1732 | if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1704 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1733 | { |
|
|
1734 | face_num = 0; |
1705 | face_num = 0; |
1735 | } |
|
|
1736 | |
1706 | |
1737 | /* We've gotten what face we want to use for the object. Now see if |
1707 | /* We've gotten what face we want to use for the object. Now see if |
1738 | * if it has changed since we last sent it to the client. |
1708 | * if it has changed since we last sent it to the client. |
1739 | */ |
1709 | */ |
1740 | if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) |
1710 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1741 | { |
1711 | { |
1742 | ns->lastmap.cells[sx][sy].faces[layer] = face_num; |
1712 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1743 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1713 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1744 | esrv_send_face (ns, face_num, 0); |
1714 | esrv_send_face (&ns, face_num, 0); |
1745 | SockList_AddShort (sl, face_num); |
1715 | |
|
|
1716 | sl << uint16 (face_num); |
1746 | return 1; |
1717 | return 1; |
1747 | } |
1718 | } |
|
|
1719 | |
1748 | /* Nothing changed */ |
1720 | /* Nothing changed */ |
1749 | return 0; |
1721 | return 0; |
1750 | } |
1722 | } |
1751 | |
1723 | |
1752 | /** |
1724 | /** |
… | |
… | |
1767 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1739 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1768 | * take. |
1740 | * take. |
1769 | */ |
1741 | */ |
1770 | |
1742 | |
1771 | static inline int |
1743 | static inline int |
1772 | update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1744 | update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1773 | { |
1745 | { |
1774 | object *ob; |
1746 | object *ob; |
1775 | int smoothlevel; /* old face_num; */ |
1747 | int smoothlevel; /* old face_num; */ |
1776 | |
1748 | |
1777 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1749 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1782 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1754 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1783 | smoothlevel = 0; |
1755 | smoothlevel = 0; |
1784 | else |
1756 | else |
1785 | { |
1757 | { |
1786 | smoothlevel = ob->smoothlevel; |
1758 | smoothlevel = ob->smoothlevel; |
1787 | if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1759 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1788 | SendSmooth (ns, ob->face->number); |
1760 | SendSmooth (&ns, ob->face->number); |
1789 | } /* else not already head object or blank face */ |
1761 | } /* else not already head object or blank face */ |
1790 | |
1762 | |
1791 | /* We've gotten what face we want to use for the object. Now see if |
1763 | /* We've gotten what face we want to use for the object. Now see if |
1792 | * if it has changed since we last sent it to the client. |
1764 | * if it has changed since we last sent it to the client. |
1793 | */ |
1765 | */ |
1794 | if (smoothlevel > 255) |
1766 | if (smoothlevel > 255) |
1795 | smoothlevel = 255; |
1767 | smoothlevel = 255; |
1796 | else if (smoothlevel < 0) |
1768 | else if (smoothlevel < 0) |
1797 | smoothlevel = 0; |
1769 | smoothlevel = 0; |
|
|
1770 | |
1798 | if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1771 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1799 | { |
1772 | { |
1800 | ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1773 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1801 | SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); |
1774 | sl << uint8 (smoothlevel); |
1802 | return 1; |
1775 | return 1; |
1803 | } |
1776 | } |
|
|
1777 | |
1804 | /* Nothing changed */ |
1778 | /* Nothing changed */ |
1805 | return 0; |
1779 | return 0; |
1806 | } |
1780 | } |
1807 | |
1781 | |
1808 | /** |
1782 | /** |
… | |
… | |
1849 | draw_client_map1 (object *pl) |
1823 | draw_client_map1 (object *pl) |
1850 | { |
1824 | { |
1851 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1825 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1852 | sint16 nx, ny; |
1826 | sint16 nx, ny; |
1853 | int estartlen, eoldlen; |
1827 | int estartlen, eoldlen; |
1854 | SockList sl; |
|
|
1855 | SockList esl; /*For extended Map info */ |
|
|
1856 | uint16 mask, emask; |
1828 | uint16 mask, emask; |
1857 | uint8 eentrysize; |
1829 | uint8 eentrysize; |
1858 | uint16 ewhatstart, ewhatflag; |
1830 | uint16 ewhatstart, ewhatflag; |
1859 | uint8 extendedinfos; |
1831 | uint8 extendedinfos; |
1860 | maptile *m; |
1832 | maptile *m; |
1861 | |
1833 | |
1862 | NewSocket & socket = pl->contr->socket; |
1834 | NewSocket &socket = pl->contr->socket; |
1863 | |
1835 | |
1864 | check_map_change (pl->contr); |
1836 | check_map_change (pl->contr); |
1865 | |
1837 | |
1866 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1838 | SockList sl (MAXSOCKBUF); |
1867 | if (socket.mapmode == Map1Cmd) |
1839 | SockList esl (MAXSOCKBUF); |
1868 | strcpy ((char *) sl.buf, "map1 "); |
1840 | |
1869 | else |
1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1870 | strcpy ((char *) sl.buf, "map1a "); |
|
|
1871 | sl.len = strlen ((char *) sl.buf); |
|
|
1872 | startlen = sl.len; |
1842 | startlen = sl.len; |
|
|
1843 | |
1873 | /*Extendedmapinfo structure initialisation */ |
1844 | /*Extendedmapinfo structure initialisation */ |
1874 | if (socket.ext_mapinfos) |
1845 | if (socket.ext_mapinfos) |
1875 | { |
1846 | { |
1876 | esl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1877 | strcpy ((char *) esl.buf, "mapextended "); |
|
|
1878 | esl.len = strlen ((char *) esl.buf); |
|
|
1879 | extendedinfos = EMI_NOREDRAW; |
1847 | extendedinfos = EMI_NOREDRAW; |
|
|
1848 | |
1880 | if (socket.EMI_smooth) |
1849 | if (socket.EMI_smooth) |
1881 | extendedinfos |= EMI_SMOOTH; |
1850 | extendedinfos |= EMI_SMOOTH; |
|
|
1851 | |
1882 | ewhatstart = esl.len; |
1852 | ewhatstart = esl.len; |
1883 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1884 | could need to be taken away */ |
1854 | could need to be taken away */ |
1885 | SockList_AddChar (&esl, extendedinfos); |
|
|
1886 | eentrysize = getExtendedMapInfoSize (&socket); |
1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1887 | SockList_AddChar (&esl, eentrysize); |
1856 | esl << "mapextended " |
|
|
1857 | << uint8 (extendedinfos) |
|
|
1858 | << uint8 (eentrysize); |
1888 | estartlen = esl.len; |
1859 | estartlen = esl.len; |
1889 | } |
1860 | } |
1890 | else |
1861 | else |
1891 | { |
1862 | { |
1892 | /* suppress compiler warnings */ |
1863 | /* suppress compiler warnings */ |
1893 | ewhatstart = 0; |
1864 | ewhatstart = 0; |
1894 | ewhatflag = 0; |
1865 | ewhatflag = 0; |
1895 | estartlen = 0; |
1866 | estartlen = 0; |
1896 | } |
1867 | } |
|
|
1868 | |
1897 | /* Init data to zero */ |
1869 | /* Init data to zero */ |
1898 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
1870 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
1899 | |
1871 | |
1900 | /* x,y are the real map locations. ax, ay are viewport relative |
1872 | /* x,y are the real map locations. ax, ay are viewport relative |
1901 | * locations. |
1873 | * locations. |
… | |
… | |
1905 | /* We could do this logic as conditionals in the if statement, |
1877 | /* We could do this logic as conditionals in the if statement, |
1906 | * but that started to get a bit messy to look at. |
1878 | * but that started to get a bit messy to look at. |
1907 | */ |
1879 | */ |
1908 | max_x = pl->x + (socket.mapx + 1) / 2; |
1880 | max_x = pl->x + (socket.mapx + 1) / 2; |
1909 | max_y = pl->y + (socket.mapy + 1) / 2; |
1881 | max_y = pl->y + (socket.mapy + 1) / 2; |
|
|
1882 | |
1910 | if (socket.mapmode == Map1aCmd) |
1883 | if (socket.mapmode == Map1aCmd) |
1911 | { |
1884 | { |
1912 | max_x += MAX_HEAD_OFFSET; |
1885 | max_x += MAX_HEAD_OFFSET; |
1913 | max_y += MAX_HEAD_OFFSET; |
1886 | max_y += MAX_HEAD_OFFSET; |
1914 | } |
1887 | } |
… | |
… | |
1931 | { |
1904 | { |
1932 | int i, got_one; |
1905 | int i, got_one; |
1933 | |
1906 | |
1934 | oldlen = sl.len; |
1907 | oldlen = sl.len; |
1935 | |
1908 | |
1936 | SockList_AddShort (&sl, mask); |
1909 | sl << uint16 (mask); |
1937 | |
1910 | |
1938 | if (check_head (sl, socket, ax, ay, 2)) |
1911 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1939 | mask |= 0x4; |
|
|
1940 | if (check_head (sl, socket, ax, ay, 1)) |
1912 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1941 | mask |= 0x2; |
|
|
1942 | if (check_head (sl, socket, ax, ay, 0)) |
1913 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
1943 | mask |= 0x1; |
|
|
1944 | |
1914 | |
1945 | /* If all we are doing is sending 0 (blank) faces, we don't |
1915 | /* If all we are doing is sending 0 (blank) faces, we don't |
1946 | * actually need to send that - just the coordinates |
1916 | * actually need to send that - just the coordinates |
1947 | * with no faces tells the client to blank out the |
1917 | * with no faces tells the client to blank out the |
1948 | * space. |
1918 | * space. |
1949 | */ |
1919 | */ |
1950 | got_one = 0; |
1920 | got_one = 0; |
1951 | for (i = oldlen + 2; i < sl.len; i++) |
1921 | for (i = oldlen + 2; i < sl.len; i++) |
1952 | { |
|
|
1953 | if (sl.buf[i]) |
1922 | if (sl.buf[i]) |
1954 | got_one = 1; |
1923 | got_one = 1; |
1955 | } |
|
|
1956 | |
1924 | |
1957 | if (got_one && (mask & 0xf)) |
1925 | if (got_one && (mask & 0xf)) |
1958 | { |
|
|
1959 | sl.buf[oldlen + 1] = mask & 0xff; |
1926 | sl.buf[oldlen + 1] = mask & 0xff; |
1960 | } |
|
|
1961 | else |
1927 | else |
1962 | { /*either all faces blank, either no face at all */ |
1928 | { /*either all faces blank, either no face at all */ |
1963 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1929 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1964 | sl.len = oldlen + 2; |
1930 | sl.len = oldlen + 2; |
1965 | else |
1931 | else |
1966 | sl.len = oldlen; |
1932 | sl.len = oldlen; |
1967 | } |
1933 | } |
|
|
1934 | |
1968 | /*What concerns extendinfos, nothing to be done for now |
1935 | /*What concerns extendinfos, nothing to be done for now |
1969 | * (perhaps effects layer later) |
1936 | * (perhaps effects layer later) |
1970 | */ |
1937 | */ |
1971 | continue; /* don't do processing below */ |
1938 | continue; /* don't do processing below */ |
1972 | } |
1939 | } |
1973 | |
1940 | |
1974 | MapCell & lastcell = socket.lastmap.cells[ax][ay]; |
1941 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1975 | |
1942 | |
1976 | d = pl->contr->blocked_los[ax][ay]; |
1943 | d = pl->contr->blocked_los[ax][ay]; |
1977 | |
1944 | |
1978 | /* If the coordinates are not valid, or it is too dark to see, |
1945 | /* If the coordinates are not valid, or it is too dark to see, |
1979 | * we tell the client as such |
1946 | * we tell the client as such |
1980 | */ |
1947 | */ |
1981 | nx = x; |
1948 | nx = x; |
1982 | ny = y; |
1949 | ny = y; |
1983 | m = get_map_from_coord (pl->map, &nx, &ny); |
1950 | m = get_map_from_coord (pl->map, &nx, &ny); |
|
|
1951 | |
1984 | if (!m) |
1952 | if (!m) |
1985 | { |
1953 | { |
1986 | /* space is out of map. Update space and clear values |
1954 | /* space is out of map. Update space and clear values |
1987 | * if this hasn't already been done. If the space is out |
1955 | * if this hasn't already been done. If the space is out |
1988 | * of the map, it shouldn't have a head |
1956 | * of the map, it shouldn't have a head |
1989 | */ |
1957 | */ |
1990 | if (lastcell.count != -1) |
1958 | if (lastcell.count != -1) |
1991 | { |
1959 | { |
1992 | SockList_AddShort (&sl, mask); |
1960 | sl << uint16 (mask); |
1993 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1961 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1994 | } |
1962 | } |
1995 | } |
1963 | } |
1996 | else if (d > 3) |
1964 | else if (d > 3) |
1997 | { |
1965 | { |
… | |
… | |
2001 | * reason. Still may need to send the head for this space. |
1969 | * reason. Still may need to send the head for this space. |
2002 | */ |
1970 | */ |
2003 | |
1971 | |
2004 | oldlen = sl.len; |
1972 | oldlen = sl.len; |
2005 | |
1973 | |
2006 | SockList_AddShort (&sl, mask); |
1974 | sl << uint16 (mask); |
|
|
1975 | |
2007 | if (lastcell.count != -1) |
1976 | if (lastcell.count != -1) |
2008 | need_send = 1; |
1977 | need_send = 1; |
|
|
1978 | |
2009 | count = -1; |
1979 | count = -1; |
2010 | |
1980 | |
2011 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
1981 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
2012 | { |
1982 | { |
2013 | /* Now check to see if any heads need to be sent */ |
1983 | /* Now check to see if any heads need to be sent */ |
2014 | |
1984 | |
2015 | if (check_head (sl, socket, ax, ay, 2)) |
1985 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
2016 | mask |= 0x4; |
|
|
2017 | if (check_head (sl, socket, ax, ay, 1)) |
1986 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
2018 | mask |= 0x2; |
|
|
2019 | if (check_head (sl, socket, ax, ay, 0)) |
1987 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
2020 | mask |= 0x1; |
|
|
2021 | |
1988 | |
2022 | lastcell.count = count; |
1989 | lastcell.count = count; |
2023 | |
|
|
2024 | } |
1990 | } |
2025 | else |
1991 | else |
2026 | { |
1992 | { |
2027 | struct MapCell *cell = &lastcell; |
|
|
2028 | |
|
|
2029 | /* properly clear a previously sent big face */ |
1993 | /* properly clear a previously sent big face */ |
2030 | if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) |
1994 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
|
|
1995 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
2031 | need_send = 1; |
1996 | need_send = 1; |
|
|
1997 | |
2032 | map_clearcell (&lastcell, 0, 0, 0, count); |
1998 | map_clearcell (&lastcell, 0, 0, 0, count); |
2033 | } |
1999 | } |
2034 | |
2000 | |
2035 | if ((mask & 0xf) || need_send) |
2001 | if ((mask & 0xf) || need_send) |
2036 | { |
|
|
2037 | sl.buf[oldlen + 1] = mask & 0xff; |
2002 | sl.buf[oldlen + 1] = mask & 0xff; |
2038 | } |
|
|
2039 | else |
2003 | else |
2040 | { |
|
|
2041 | sl.len = oldlen; |
2004 | sl.len = oldlen; |
2042 | } |
|
|
2043 | } |
2005 | } |
2044 | else |
2006 | else |
2045 | { |
2007 | { |
2046 | /* In this block, the space is visible or there are head objects |
2008 | /* In this block, the space is visible or there are head objects |
2047 | * we need to send. |
2009 | * we need to send. |
… | |
… | |
2059 | */ |
2021 | */ |
2060 | oldlen = sl.len; |
2022 | oldlen = sl.len; |
2061 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2062 | eoldlen = esl.len; |
2024 | eoldlen = esl.len; |
2063 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2064 | SockList_AddShort (&sl, mask); |
2026 | sl << uint16 (mask); |
2065 | |
2027 | |
2066 | if (socket.ext_mapinfos) |
2028 | if (socket.ext_mapinfos) |
2067 | SockList_AddShort (&esl, emask); |
2029 | esl << uint16 (emask); |
2068 | |
2030 | |
2069 | unsigned char dummy; |
2031 | unsigned char dummy; |
2070 | unsigned char *last_ext = &dummy; |
2032 | unsigned char *last_ext = &dummy; |
2071 | |
2033 | |
2072 | /* Darkness changed */ |
2034 | /* Darkness changed */ |
… | |
… | |
2076 | |
2038 | |
2077 | if (socket.extmap) |
2039 | if (socket.extmap) |
2078 | { |
2040 | { |
2079 | *last_ext |= 0x80; |
2041 | *last_ext |= 0x80; |
2080 | last_ext = sl.buf + sl.len; |
2042 | last_ext = sl.buf + sl.len; |
2081 | SockList_AddChar (&sl, d); |
2043 | sl << uint8 (d); |
2082 | } |
2044 | } |
2083 | else |
2045 | else |
2084 | SockList_AddChar (&sl, 255 - 64 * d); |
2046 | sl << uint8 (255 - 64 * d); |
2085 | } |
2047 | } |
2086 | |
2048 | |
2087 | lastcell.count = d; |
2049 | lastcell.count = d; |
2088 | |
2050 | |
2089 | if (socket.extmap) |
2051 | if (socket.extmap) |
2090 | { |
2052 | { |
2091 | uint8 stat_hp = 0; |
2053 | uint8 stat_hp = 0; |
2092 | uint8 stat_width = 0; |
2054 | uint8 stat_width = 0; |
|
|
2055 | uint8 flags = 0; |
2093 | tag_t player = 0; |
2056 | UUID player = 0; |
2094 | |
2057 | |
2095 | // send hp information, if applicable |
2058 | // send hp information, if applicable |
2096 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2059 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2097 | { |
2060 | { |
2098 | if (op->head || op->invisible) |
2061 | if (op->head || op->invisible) |
… | |
… | |
2105 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
2068 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
2106 | stat_width = op->arch->tail_x; |
2069 | stat_width = op->arch->tail_x; |
2107 | } |
2070 | } |
2108 | } |
2071 | } |
2109 | |
2072 | |
|
|
2073 | if (op->msg && op->msg[0] == '@') |
|
|
2074 | flags |= 1; |
|
|
2075 | |
2110 | if (op->type == PLAYER && op != pl) |
2076 | if (op->type == PLAYER && op != pl) |
2111 | player = op->count; |
2077 | player = op->count; |
2112 | } |
2078 | } |
2113 | |
2079 | |
2114 | if (lastcell.stat_hp != stat_hp) |
2080 | if (lastcell.stat_hp != stat_hp) |
… | |
… | |
2116 | lastcell.stat_hp = stat_hp; |
2082 | lastcell.stat_hp = stat_hp; |
2117 | |
2083 | |
2118 | mask |= 0x8; |
2084 | mask |= 0x8; |
2119 | *last_ext |= 0x80; |
2085 | *last_ext |= 0x80; |
2120 | last_ext = sl.buf + sl.len; |
2086 | last_ext = sl.buf + sl.len; |
2121 | SockList_AddChar (&sl, 5); |
2087 | |
2122 | SockList_AddChar (&sl, stat_hp); |
2088 | sl << uint8 (5) << uint8 (stat_hp); |
2123 | |
2089 | |
2124 | if (stat_width > 1) |
2090 | if (stat_width > 1) |
2125 | { |
2091 | { |
2126 | *last_ext |= 0x80; |
2092 | *last_ext |= 0x80; |
2127 | last_ext = sl.buf + sl.len; |
2093 | last_ext = sl.buf + sl.len; |
2128 | SockList_AddChar (&sl, 6); |
2094 | |
2129 | SockList_AddChar (&sl, stat_width); |
2095 | sl << uint8 (6) << uint8 (stat_width); |
2130 | } |
2096 | } |
2131 | } |
2097 | } |
2132 | |
2098 | |
2133 | if (lastcell.player != player) |
2099 | if (lastcell.player != player) |
2134 | { |
2100 | { |
2135 | lastcell.player = player; |
2101 | lastcell.player = player; |
2136 | |
2102 | |
2137 | mask |= 0x8; |
2103 | mask |= 0x8; |
2138 | *last_ext |= 0x80; |
2104 | *last_ext |= 0x80; |
2139 | last_ext = sl.buf + sl.len; |
2105 | last_ext = sl.buf + sl.len; |
2140 | SockList_AddChar (&sl, 0x47); |
2106 | |
2141 | SockList_AddChar (&sl, 4); |
2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2142 | SockList_AddInt (&sl, player); |
2108 | } |
|
|
2109 | |
|
|
2110 | if (lastcell.flags != flags) |
|
|
2111 | { |
|
|
2112 | lastcell.flags = flags; |
|
|
2113 | |
|
|
2114 | mask |= 0x8; |
|
|
2115 | *last_ext |= 0x80; |
|
|
2116 | last_ext = sl.buf + sl.len; |
|
|
2117 | |
|
|
2118 | sl << uint8 (8) << uint8 (flags); |
2143 | } |
2119 | } |
2144 | } |
2120 | } |
2145 | |
2121 | |
2146 | /* Floor face */ |
2122 | /* Floor face */ |
2147 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) |
2123 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
2148 | mask |= 0x4; |
2124 | mask |= 0x4; |
2149 | |
2125 | |
2150 | if (socket.EMI_smooth) |
2126 | if (socket.EMI_smooth) |
2151 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) |
2127 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
2152 | emask |= 0x4; |
2128 | emask |= 0x4; |
2153 | |
2129 | |
2154 | /* Middle face */ |
2130 | /* Middle face */ |
2155 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) |
2131 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
2156 | mask |= 0x2; |
2132 | mask |= 0x2; |
2157 | |
2133 | |
2158 | if (socket.EMI_smooth) |
2134 | if (socket.EMI_smooth) |
2159 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) |
2135 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
2160 | emask |= 0x2; |
2136 | emask |= 0x2; |
2161 | |
2137 | |
2162 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2138 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2163 | { |
2139 | { |
2164 | if (lastcell.faces[0] != pl->face->number) |
2140 | if (lastcell.faces[0] != pl->face->number) |
2165 | { |
2141 | { |
2166 | lastcell.faces[0] = pl->face->number; |
2142 | lastcell.faces[0] = pl->face->number; |
2167 | mask |= 0x1; |
2143 | mask |= 0x1; |
|
|
2144 | |
2168 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2145 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2169 | esrv_send_face (&socket, pl->face->number, 0); |
2146 | esrv_send_face (&socket, pl->face->number, 0); |
2170 | SockList_AddShort (&sl, pl->face->number); |
2147 | |
|
|
2148 | sl << uint16 (pl->face->number); |
2171 | } |
2149 | } |
2172 | } |
2150 | } |
2173 | /* Top face */ |
|
|
2174 | else |
2151 | else |
2175 | { |
2152 | { |
|
|
2153 | /* Top face */ |
2176 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) |
2154 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
2177 | mask |= 0x1; |
2155 | mask |= 0x1; |
|
|
2156 | |
2178 | if (socket.EMI_smooth) |
2157 | if (socket.EMI_smooth) |
2179 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) |
2158 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
2180 | { |
|
|
2181 | emask |= 0x1; |
2159 | emask |= 0x1; |
2182 | } |
|
|
2183 | } |
2160 | } |
|
|
2161 | |
2184 | /* Check to see if we are in fact sending anything for this |
2162 | /* Check to see if we are in fact sending anything for this |
2185 | * space by checking the mask. If so, update the mask. |
2163 | * space by checking the mask. If so, update the mask. |
2186 | * if not, reset the len to that from before adding the mask |
2164 | * if not, reset the len to that from before adding the mask |
2187 | * value, so we don't send those bits. |
2165 | * value, so we don't send those bits. |
2188 | */ |
2166 | */ |
2189 | if (mask & 0xf) |
2167 | if (mask & 0xf) |
2190 | { |
|
|
2191 | sl.buf[oldlen + 1] = mask & 0xff; |
2168 | sl.buf[oldlen + 1] = mask & 0xff; |
2192 | } |
|
|
2193 | else |
2169 | else |
2194 | { |
|
|
2195 | sl.len = oldlen; |
2170 | sl.len = oldlen; |
2196 | } |
2171 | |
2197 | if (emask & 0xf) |
2172 | if (emask & 0xf) |
2198 | { |
|
|
2199 | esl.buf[eoldlen + 1] = emask & 0xff; |
2173 | esl.buf[eoldlen + 1] = emask & 0xff; |
2200 | } |
|
|
2201 | else |
2174 | else |
2202 | { |
|
|
2203 | esl.len = eoldlen; |
2175 | esl.len = eoldlen; |
2204 | } |
|
|
2205 | } /* else this is a viewable space */ |
2176 | } /* else this is a viewable space */ |
2206 | } /* for x loop */ |
2177 | } /* for x loop */ |
2207 | } /* for y loop */ |
2178 | } /* for y loop */ |
2208 | |
2179 | |
2209 | /* Verify that we in fact do need to send this */ |
2180 | /* Verify that we in fact do need to send this */ |
… | |
… | |
2218 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2219 | } |
2190 | } |
2220 | |
2191 | |
2221 | if (esl.len > estartlen) |
2192 | if (esl.len > estartlen) |
2222 | Send_With_Handling (&socket, &esl); |
2193 | Send_With_Handling (&socket, &esl); |
2223 | |
|
|
2224 | free (esl.buf); |
|
|
2225 | } |
2194 | } |
2226 | |
2195 | |
2227 | if (sl.len > startlen || socket.sent_scroll) |
2196 | if (sl.len > startlen || socket.sent_scroll) |
2228 | { |
2197 | { |
2229 | Send_With_Handling (&socket, &sl); |
2198 | Send_With_Handling (&socket, &sl); |
2230 | socket.sent_scroll = 0; |
2199 | socket.sent_scroll = 0; |
2231 | } |
2200 | } |
2232 | |
2201 | |
2233 | free (sl.buf); |
2202 | sl.free (); |
|
|
2203 | esl.free (); |
2234 | } |
2204 | } |
2235 | |
2205 | |
2236 | /** |
2206 | /** |
2237 | * Draws client map. |
2207 | * Draws client map. |
2238 | */ |
2208 | */ |
… | |
… | |
2352 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2322 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2353 | } |
2323 | } |
2354 | } /* Is a valid space */ |
2324 | } /* Is a valid space */ |
2355 | } |
2325 | } |
2356 | } |
2326 | } |
|
|
2327 | |
2357 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2328 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2358 | |
2329 | |
2359 | check_map_change (pl->contr); |
2330 | check_map_change (pl->contr); |
2360 | } |
2331 | } |
2361 | |
2332 | |
… | |
… | |
2378 | /** |
2349 | /** |
2379 | * This sends the skill number to name mapping. We ignore |
2350 | * This sends the skill number to name mapping. We ignore |
2380 | * the params - we always send the same info no matter what. |
2351 | * the params - we always send the same info no matter what. |
2381 | */ |
2352 | */ |
2382 | void |
2353 | void |
2383 | send_skill_info (NewSocket * ns, char *params) |
2354 | send_skill_info (NewSocket *ns, char *params) |
2384 | { |
2355 | { |
2385 | SockList sl; |
2356 | SockList sl (MAXSOCKBUF); |
2386 | int i; |
2357 | sl << "replyinfo skill_info\n"; |
2387 | |
2358 | |
2388 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2389 | strcpy ((char *) sl.buf, "replyinfo skill_info\n"); |
|
|
2390 | for (i = 1; i < NUM_SKILLS; i++) |
2359 | for (int i = 1; i < NUM_SKILLS; i++) |
2391 | { |
2360 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2392 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2361 | |
2393 | } |
|
|
2394 | sl.len = strlen ((char *) sl.buf); |
|
|
2395 | if (sl.len >= MAXSOCKBUF) |
2362 | if (sl.len >= MAXSOCKBUF) |
2396 | { |
2363 | { |
2397 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2364 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2398 | fatal (0); |
2365 | fatal (0); |
2399 | } |
2366 | } |
|
|
2367 | |
2400 | Send_With_Handling (ns, &sl); |
2368 | Send_With_Handling (ns, &sl); |
2401 | free (sl.buf); |
2369 | sl.free (); |
2402 | } |
2370 | } |
2403 | |
2371 | |
2404 | /** |
2372 | /** |
2405 | * This sends the spell path to name mapping. We ignore |
2373 | * This sends the spell path to name mapping. We ignore |
2406 | * the params - we always send the same info no matter what. |
2374 | * the params - we always send the same info no matter what. |
2407 | */ |
2375 | */ |
2408 | void |
2376 | void |
2409 | send_spell_paths (NewSocket * ns, char *params) |
2377 | send_spell_paths (NewSocket * ns, char *params) |
2410 | { |
2378 | { |
2411 | SockList sl; |
2379 | SockList sl (MAXSOCKBUF); |
2412 | int i; |
|
|
2413 | |
2380 | |
2414 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2381 | sl << "replyinfo spell_paths\n"; |
2415 | strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); |
2382 | |
2416 | for (i = 0; i < NRSPELLPATHS; i++) |
2383 | for (int i = 0; i < NRSPELLPATHS; i++) |
2417 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); |
2384 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2418 | sl.len = strlen ((char *) sl.buf); |
2385 | |
2419 | if (sl.len >= MAXSOCKBUF) |
2386 | if (sl.len >= MAXSOCKBUF) |
2420 | { |
2387 | { |
2421 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2388 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2422 | fatal (0); |
2389 | fatal (0); |
2423 | } |
2390 | } |
|
|
2391 | |
2424 | Send_With_Handling (ns, &sl); |
2392 | Send_With_Handling (ns, &sl); |
2425 | free (sl.buf); |
2393 | sl.free (); |
2426 | } |
2394 | } |
2427 | |
2395 | |
2428 | /** |
2396 | /** |
2429 | * This looks for any spells the player may have that have changed their stats. |
2397 | * This looks for any spells the player may have that have changed their stats. |
2430 | * it then sends an updspell packet for each spell that has changed in this way |
2398 | * it then sends an updspell packet for each spell that has changed in this way |
2431 | */ |
2399 | */ |
2432 | void |
2400 | void |
2433 | esrv_update_spells (player *pl) |
2401 | esrv_update_spells (player *pl) |
2434 | { |
2402 | { |
2435 | SockList sl; |
|
|
2436 | int flags = 0; |
|
|
2437 | object *spell; |
|
|
2438 | |
|
|
2439 | if (!pl->socket.monitor_spells) |
2403 | if (!pl->socket.monitor_spells) |
2440 | return; |
2404 | return; |
|
|
2405 | |
2441 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2406 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2442 | { |
2407 | { |
2443 | if (spell->type == SPELL) |
2408 | if (spell->type == SPELL) |
2444 | { |
2409 | { |
|
|
2410 | int flags = 0; |
|
|
2411 | |
2445 | /* check if we need to update it */ |
2412 | /* check if we need to update it */ |
2446 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2413 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2447 | { |
2414 | { |
2448 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2415 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2449 | flags |= UPD_SP_MANA; |
2416 | flags |= UPD_SP_MANA; |
2450 | } |
2417 | } |
|
|
2418 | |
2451 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2419 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2452 | { |
2420 | { |
2453 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2421 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2454 | flags |= UPD_SP_GRACE; |
2422 | flags |= UPD_SP_GRACE; |
2455 | } |
2423 | } |
|
|
2424 | |
2456 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2425 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2457 | { |
2426 | { |
2458 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2427 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2459 | flags |= UPD_SP_DAMAGE; |
2428 | flags |= UPD_SP_DAMAGE; |
2460 | } |
2429 | } |
|
|
2430 | |
2461 | if (flags != 0) |
2431 | if (flags) |
2462 | { |
2432 | { |
2463 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2433 | SockList sl (MAXSOCKBUF); |
2464 | strcpy ((char *) sl.buf, "updspell "); |
2434 | |
2465 | sl.len = strlen ((char *) sl.buf); |
2435 | sl << "updspell " |
2466 | SockList_AddChar (&sl, flags); |
2436 | << uint8 (flags) |
2467 | SockList_AddInt (&sl, spell->count); |
2437 | << uint32 (spell->count); |
2468 | if (flags & UPD_SP_MANA) |
2438 | |
2469 | SockList_AddShort (&sl, spell->last_sp); |
2439 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2470 | if (flags & UPD_SP_GRACE) |
2440 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2471 | SockList_AddShort (&sl, spell->last_grace); |
2441 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2472 | if (flags & UPD_SP_DAMAGE) |
2442 | |
2473 | SockList_AddShort (&sl, spell->last_eat); |
|
|
2474 | flags = 0; |
|
|
2475 | Send_With_Handling (&pl->socket, &sl); |
2443 | Send_With_Handling (&pl->socket, &sl); |
2476 | free (sl.buf); |
2444 | sl.free (); |
2477 | } |
2445 | } |
2478 | } |
2446 | } |
2479 | } |
2447 | } |
2480 | } |
2448 | } |
2481 | |
2449 | |
2482 | void |
2450 | void |
2483 | esrv_remove_spell (player *pl, object *spell) |
2451 | esrv_remove_spell (player *pl, object *spell) |
2484 | { |
2452 | { |
2485 | SockList sl; |
|
|
2486 | |
|
|
2487 | if (!pl->socket.monitor_spells) |
2453 | if (!pl->socket.monitor_spells) |
2488 | return; |
2454 | return; |
|
|
2455 | |
2489 | if (!pl || !spell || spell->env != pl->ob) |
2456 | if (!pl || !spell || spell->env != pl->ob) |
2490 | { |
2457 | { |
2491 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2458 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2492 | return; |
2459 | return; |
2493 | } |
2460 | } |
2494 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2461 | |
2495 | strcpy ((char *) sl.buf, "delspell "); |
2462 | SockList sl (MAXSOCKBUF); |
2496 | sl.len = strlen ((char *) sl.buf); |
2463 | |
2497 | SockList_AddInt (&sl, spell->count); |
2464 | sl << "delspell " |
|
|
2465 | << uint32 (spell->count); |
|
|
2466 | |
2498 | Send_With_Handling (&pl->socket, &sl); |
2467 | Send_With_Handling (&pl->socket, &sl); |
2499 | free (sl.buf); |
2468 | sl.free (); |
2500 | } |
2469 | } |
2501 | |
2470 | |
2502 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2471 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2503 | static void |
2472 | static void |
2504 | append_spell (player *pl, SockList * sl, object *spell) |
2473 | append_spell (player *pl, SockList &sl, object *spell) |
2505 | { |
2474 | { |
2506 | int len, i, skill = 0; |
2475 | int len, i, skill = 0; |
2507 | |
2476 | |
2508 | if (!(spell->name)) |
2477 | if (!(spell->name)) |
2509 | { |
2478 | { |
2510 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2479 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2511 | return; |
2480 | return; |
2512 | } |
2481 | } |
2513 | SockList_AddInt (sl, spell->count); |
2482 | |
2514 | SockList_AddShort (sl, spell->level); |
|
|
2515 | SockList_AddShort (sl, spell->casting_time); |
|
|
2516 | /* store costs and damage in the object struct, to compare to later */ |
2483 | /* store costs and damage in the object struct, to compare to later */ |
2517 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2484 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2518 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2485 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2519 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2486 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2520 | /* send the current values */ |
|
|
2521 | SockList_AddShort (sl, spell->last_sp); |
|
|
2522 | SockList_AddShort (sl, spell->last_grace); |
|
|
2523 | SockList_AddShort (sl, spell->last_eat); |
|
|
2524 | |
2487 | |
2525 | /* figure out which skill it uses, if it uses one */ |
2488 | /* figure out which skill it uses, if it uses one */ |
2526 | if (spell->skill) |
2489 | if (spell->skill) |
2527 | { |
2490 | { |
2528 | for (i = 1; i < NUM_SKILLS; i++) |
2491 | for (i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2530 | { |
2493 | { |
2531 | skill = i + CS_STAT_SKILLINFO; |
2494 | skill = i + CS_STAT_SKILLINFO; |
2532 | break; |
2495 | break; |
2533 | } |
2496 | } |
2534 | } |
2497 | } |
2535 | SockList_AddChar (sl, skill); |
|
|
2536 | |
2498 | |
2537 | SockList_AddInt (sl, spell->path_attuned); |
2499 | /* send the current values */ |
|
|
2500 | sl << uint32 (spell->count) |
|
|
2501 | << uint16 (spell->level) |
|
|
2502 | << uint16 (spell->casting_time) |
|
|
2503 | << uint16 (spell->last_sp) |
|
|
2504 | << uint16 (spell->last_grace) |
|
|
2505 | << uint16 (spell->last_eat) |
|
|
2506 | << uint8 (skill) |
|
|
2507 | << uint32 (spell->path_attuned) |
2538 | SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); |
2508 | << uint32 (spell->face ? spell->face->number : 0) |
2539 | |
2509 | << data8 (spell->name) |
2540 | len = strlen (spell->name); |
2510 | << data16 (spell->msg); |
2541 | SockList_AddChar (sl, (char) len); |
|
|
2542 | memcpy (sl->buf + sl->len, spell->name, len); |
|
|
2543 | sl->len += len; |
|
|
2544 | |
|
|
2545 | if (!spell->msg) |
|
|
2546 | { |
|
|
2547 | SockList_AddShort (sl, 0); |
|
|
2548 | } |
|
|
2549 | else |
|
|
2550 | { |
|
|
2551 | len = strlen (spell->msg); |
|
|
2552 | SockList_AddShort (sl, len); |
|
|
2553 | memcpy (sl->buf + sl->len, spell->msg, len); |
|
|
2554 | sl->len += len; |
|
|
2555 | } |
|
|
2556 | } |
2511 | } |
2557 | |
2512 | |
2558 | /** |
2513 | /** |
2559 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
2514 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
2560 | * all spells in the player's inventory. |
2515 | * all spells in the player's inventory. |
2561 | */ |
2516 | */ |
2562 | void |
2517 | void |
2563 | esrv_add_spells (player *pl, object *spell) |
2518 | esrv_add_spells (player *pl, object *spell) |
2564 | { |
2519 | { |
2565 | SockList sl; |
|
|
2566 | |
|
|
2567 | if (!pl) |
2520 | if (!pl) |
2568 | { |
2521 | { |
2569 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2522 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2570 | return; |
2523 | return; |
2571 | } |
2524 | } |
|
|
2525 | |
2572 | if (!pl->socket.monitor_spells) |
2526 | if (!pl->socket.monitor_spells) |
2573 | return; |
2527 | return; |
2574 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2528 | |
2575 | strcpy ((char *) sl.buf, "addspell "); |
2529 | SockList sl (MAXSOCKBUF); |
2576 | sl.len = strlen ((char *) sl.buf); |
2530 | |
|
|
2531 | sl << "addspell "; |
|
|
2532 | |
2577 | if (!spell) |
2533 | if (!spell) |
2578 | { |
2534 | { |
2579 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2535 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2580 | { |
2536 | { |
2581 | /* were we to simply keep appending data here, we could exceed |
2537 | /* were we to simply keep appending data here, we could exceed |
… | |
… | |
2591 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2547 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2592 | * like it will fix this |
2548 | * like it will fix this |
2593 | */ |
2549 | */ |
2594 | if (spell->type != SPELL) |
2550 | if (spell->type != SPELL) |
2595 | continue; |
2551 | continue; |
|
|
2552 | |
2596 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2553 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2597 | { |
2554 | { |
2598 | Send_With_Handling (&pl->socket, &sl); |
2555 | Send_With_Handling (&pl->socket, &sl); |
2599 | strcpy ((char *) sl.buf, "addspell "); |
2556 | strcpy ((char *) sl.buf, "addspell "); |
2600 | sl.len = strlen ((char *) sl.buf); |
2557 | sl.len = strlen ((char *) sl.buf); |
2601 | } |
2558 | } |
|
|
2559 | |
2602 | append_spell (pl, &sl, spell); |
2560 | append_spell (pl, sl, spell); |
2603 | } |
2561 | } |
2604 | } |
2562 | } |
2605 | else if (spell->type != SPELL) |
2563 | else if (spell->type != SPELL) |
2606 | { |
2564 | { |
2607 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
2565 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
2608 | return; |
2566 | return; |
2609 | } |
2567 | } |
2610 | else |
2568 | else |
2611 | append_spell (pl, &sl, spell); |
2569 | append_spell (pl, sl, spell); |
|
|
2570 | |
2612 | if (sl.len >= MAXSOCKBUF) |
2571 | if (sl.length () >= MAXSOCKBUF) |
2613 | { |
2572 | { |
2614 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2573 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2615 | fatal (0); |
2574 | fatal (0); |
2616 | } |
2575 | } |
|
|
2576 | |
2617 | /* finally, we can send the packet */ |
2577 | /* finally, we can send the packet */ |
2618 | Send_With_Handling (&pl->socket, &sl); |
2578 | Send_With_Handling (&pl->socket, &sl); |
2619 | free (sl.buf); |
2579 | |
|
|
2580 | sl.free (); |
2620 | } |
2581 | } |
|
|
2582 | |