… | |
… | |
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 | |
… | |
… | |
684 | */ |
682 | */ |
685 | static void |
683 | static void |
686 | SendSmooth (NewSocket * ns, uint16 face) |
684 | SendSmooth (NewSocket * ns, uint16 face) |
687 | { |
685 | { |
688 | uint16 smoothface; |
686 | uint16 smoothface; |
689 | unsigned char reply[MAX_BUF]; |
|
|
690 | SockList sl; |
|
|
691 | |
687 | |
692 | /* 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 |
693 | * again. |
689 | * again. |
694 | */ |
690 | */ |
695 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
691 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
… | |
… | |
703 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
699 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
704 | esrv_send_face (ns, smoothface, 0); |
700 | esrv_send_face (ns, smoothface, 0); |
705 | |
701 | |
706 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
702 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
707 | |
703 | |
708 | sl.buf = reply; |
704 | SockList sl (MAXSOCKBUF); |
709 | strcpy ((char *) sl.buf, "smooth "); |
705 | |
710 | sl.len = strlen ((char *) sl.buf); |
706 | sl << "smooth " |
711 | SockList_AddShort (&sl, face); |
707 | << uint16 (face) |
712 | SockList_AddShort (&sl, smoothface); |
708 | << uint16 (smoothface); |
|
|
709 | |
713 | Send_With_Handling (ns, &sl); |
710 | Send_With_Handling (ns, &sl); |
|
|
711 | sl.free (); |
714 | } |
712 | } |
715 | |
713 | |
716 | /** |
714 | /** |
717 | * Tells client the picture it has to use |
715 | * Tells client the picture it has to use |
718 | * to smooth a picture number given as argument. |
716 | * to smooth a picture number given as argument. |
… | |
… | |
724 | |
722 | |
725 | facenbr = atoi (buf); |
723 | facenbr = atoi (buf); |
726 | SendSmooth (ns, facenbr); |
724 | SendSmooth (ns, facenbr); |
727 | } |
725 | } |
728 | |
726 | |
729 | |
|
|
730 | |
|
|
731 | |
|
|
732 | |
|
|
733 | /** |
727 | /** |
734 | * 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, |
735 | * etc.) |
729 | * etc.) |
736 | */ |
730 | */ |
737 | void |
731 | void |
… | |
… | |
790 | */ |
784 | */ |
791 | void |
785 | void |
792 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
786 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
793 | { |
787 | { |
794 | int time, repeat; |
788 | int time, repeat; |
|
|
789 | char command[MAX_BUF]; |
795 | short packet; |
790 | short packet; |
796 | unsigned char command[MAX_BUF]; |
|
|
797 | SockList sl; |
|
|
798 | |
791 | |
799 | if (len < 7) |
792 | if (len < 7) |
800 | { |
793 | { |
801 | 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); |
802 | return; |
795 | return; |
803 | } |
796 | } |
804 | |
797 | |
805 | packet = GetShort_String (buf); |
798 | packet = net_uint16 (buf); |
806 | repeat = GetInt_String (buf + 2); |
799 | repeat = net_uint32 (buf + 2); |
|
|
800 | |
807 | /* -1 is special - no repeat, but don't update */ |
801 | /* -1 is special - no repeat, but don't update */ |
808 | if (repeat != -1) |
802 | if (repeat != -1) |
809 | { |
|
|
810 | pl->count = repeat; |
803 | pl->count = repeat; |
811 | } |
804 | |
812 | if ((len - 4) >= MAX_BUF) |
805 | if ((len - 4) >= MAX_BUF) |
813 | len = MAX_BUF - 5; |
806 | len = MAX_BUF - 5; |
814 | |
807 | |
815 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
808 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
816 | command[len - 4] = '\0'; |
809 | command[len - 4] = '\0'; |
… | |
… | |
826 | return; |
819 | return; |
827 | } |
820 | } |
828 | |
821 | |
829 | /* This should not happen anymore. */ |
822 | /* This should not happen anymore. */ |
830 | if (pl->ob->speed_left < -1.0) |
823 | if (pl->ob->speed_left < -1.0) |
831 | { |
|
|
832 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
824 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
833 | } |
825 | |
834 | /* In c_new.c */ |
826 | /* In c_new.c */ |
835 | execute_newserver_command (pl->ob, (char *) command); |
827 | execute_newserver_command (pl->ob, (char *) command); |
836 | /* Perhaps something better should be done with a left over count. |
828 | /* Perhaps something better should be done with a left over count. |
837 | * Cleaning up the input should probably be done first - all actions |
829 | * Cleaning up the input should probably be done first - all actions |
838 | * 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 |
839 | * commands. |
831 | * commands. |
840 | */ |
832 | */ |
841 | pl->count = 0; |
833 | pl->count = 0; |
842 | |
834 | |
843 | /* Send confirmation of command execution now */ |
|
|
844 | sl.buf = command; |
|
|
845 | strcpy ((char *) sl.buf, "comc "); |
|
|
846 | sl.len = 5; |
|
|
847 | SockList_AddShort (&sl, packet); |
|
|
848 | if (FABS (pl->ob->speed) < 0.001) |
835 | if (FABS (pl->ob->speed) < 0.001) |
849 | time = MAX_TIME * 100; |
836 | time = MAX_TIME * 100; |
850 | else |
837 | else |
851 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
838 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
852 | SockList_AddInt (&sl, time); |
839 | |
|
|
840 | /* Send confirmation of command execution now */ |
|
|
841 | |
|
|
842 | SockList sl (MAXSOCKBUF); |
|
|
843 | sl << "comc " << uint16 (packet) << uint32 (time); |
853 | Send_With_Handling (&pl->socket, &sl); |
844 | Send_With_Handling (&pl->socket, &sl); |
|
|
845 | sl.free (); |
854 | } |
846 | } |
855 | |
847 | |
856 | |
848 | |
857 | /** This is a reply to a previous query. */ |
849 | /** This is a reply to a previous query. */ |
858 | void |
850 | void |
… | |
… | |
970 | /* these are old dxclients */ |
962 | /* these are old dxclients */ |
971 | /* Version 1024 added support for singular + plural name values - |
963 | /* Version 1024 added support for singular + plural name values - |
972 | * requiing this minimal value reduces complexity of that code, and it |
964 | * requiing this minimal value reduces complexity of that code, and it |
973 | * has been around for a long time. |
965 | * has been around for a long time. |
974 | */ |
966 | */ |
975 | if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) |
967 | if (ns->sc_version < 1026) |
976 | { |
968 | { |
977 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
969 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
978 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
970 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
979 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
971 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
980 | } |
972 | } |
… | |
… | |
1061 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1053 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1062 | } |
1054 | } |
1063 | |
1055 | |
1064 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1056 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1065 | Old = New; \ |
1057 | Old = New; \ |
1066 | SockList_AddChar(&sl, Type); \ |
1058 | sl << uint8 (Type) << uint64 (New); \ |
1067 | SockList_AddInt64(&sl, New); \ |
|
|
1068 | } |
1059 | } |
1069 | |
1060 | |
1070 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1061 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1071 | Old = New; \ |
1062 | Old = New; \ |
1072 | SockList_AddChar(&sl, Type); \ |
1063 | sl << uint8 (Type) << uint32 (New); \ |
1073 | SockList_AddInt(&sl, New); \ |
|
|
1074 | } |
1064 | } |
1075 | |
1065 | |
1076 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1066 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
1067 | Old = New; \ |
1078 | SockList_AddChar(&sl, Type); \ |
1068 | sl << uint8 (Type) << uint16 (New); \ |
1079 | SockList_AddShort(&sl, New); \ |
|
|
1080 | } |
1069 | } |
1081 | |
1070 | |
1082 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1071 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1083 | Old = New; \ |
1072 | Old = New; \ |
1084 | SockList_AddChar(&sl, Type); \ |
1073 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
1085 | SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ |
|
|
1086 | } |
1074 | } |
1087 | |
1075 | |
1088 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1076 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1089 | if (Old) free(Old);\ |
|
|
1090 | Old = strdup_local(New);\ |
1077 | free(Old); Old = strdup (New);\ |
1091 | SockList_AddChar(&sl, Type); \ |
1078 | sl << uint8 (Type) << data8 (New); \ |
1092 | SockList_AddChar(&sl, ( char )strlen(New)); \ |
|
|
1093 | strcpy((char*)sl.buf + sl.len, New); \ |
|
|
1094 | sl.len += strlen(New); \ |
|
|
1095 | } |
1079 | } |
1096 | |
1080 | |
1097 | /** |
1081 | /** |
1098 | * Sends a statistics update. We look at the old values, |
1082 | * Sends a statistics update. We look at the old values, |
1099 | * 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 |
… | |
… | |
1101 | * commands for now. |
1085 | * commands for now. |
1102 | */ |
1086 | */ |
1103 | void |
1087 | void |
1104 | esrv_update_stats (player *pl) |
1088 | esrv_update_stats (player *pl) |
1105 | { |
1089 | { |
1106 | SockList sl; |
|
|
1107 | char buf[MAX_BUF]; |
1090 | char buf[MAX_BUF]; |
1108 | uint16 flags; |
1091 | uint16 flags; |
1109 | |
1092 | |
1110 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1093 | SockList sl (MAXSOCKBUF); |
1111 | strcpy ((char *) sl.buf, "stats "); |
1094 | sl << "stats "; |
1112 | sl.len = strlen ((char *) sl.buf); |
|
|
1113 | |
1095 | |
1114 | if (pl->ob != NULL) |
1096 | if (pl->ob != NULL) |
1115 | { |
1097 | { |
1116 | 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); |
1117 | 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); |
… | |
… | |
1134 | |
1116 | |
1135 | for (s = 0; s < NUM_SKILLS; s++) |
1117 | for (s = 0; s < NUM_SKILLS; s++) |
1136 | { |
1118 | { |
1137 | 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) |
1138 | { |
1120 | { |
1139 | |
|
|
1140 | /* Always send along the level if exp changes. This is only |
1121 | /* Always send along the level if exp changes. This is only |
1141 | * 1 extra byte, but keeps processing simpler. |
1122 | * 1 extra byte, but keeps processing simpler. |
1142 | */ |
1123 | */ |
1143 | SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); |
1124 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1144 | SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); |
1125 | << uint8 (pl->last_skill_ob[s]->level) |
1145 | SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); |
1126 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
|
|
1127 | |
1146 | 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; |
1147 | } |
1129 | } |
1148 | } |
1130 | } |
1149 | } |
1131 | } |
1150 | |
1132 | |
… | |
… | |
1206 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1188 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1207 | #endif |
1189 | #endif |
1208 | Send_With_Handling (&pl->socket, &sl); |
1190 | Send_With_Handling (&pl->socket, &sl); |
1209 | } |
1191 | } |
1210 | |
1192 | |
1211 | free (sl.buf); |
1193 | sl.free (); |
1212 | } |
1194 | } |
1213 | |
1195 | |
1214 | /** |
1196 | /** |
1215 | * 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. |
1216 | */ |
1198 | */ |
1217 | void |
1199 | void |
1218 | esrv_new_player (player *pl, uint32 weight) |
1200 | esrv_new_player (player *pl, uint32 weight) |
1219 | { |
1201 | { |
1220 | SockList sl; |
|
|
1221 | |
|
|
1222 | pl->last_weight = weight; |
1202 | pl->last_weight = weight; |
1223 | |
1203 | |
1224 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1204 | SockList sl (MAXSOCKBUF); |
|
|
1205 | sl << "player "; |
1225 | |
1206 | |
1226 | strcpy ((char *) sl.buf, "player "); |
1207 | sl << uint32 (pl->ob->count) |
1227 | sl.len = strlen ((char *) sl.buf); |
1208 | << uint32 (weight) |
1228 | SockList_AddInt (&sl, pl->ob->count); |
1209 | << uint32 (pl->ob->face->number) |
1229 | SockList_AddInt (&sl, weight); |
1210 | << data8 (pl->ob->name); |
1230 | SockList_AddInt (&sl, pl->ob->face->number); |
|
|
1231 | |
|
|
1232 | SockList_AddChar (&sl, (char) strlen (pl->ob->name)); |
|
|
1233 | strcpy ((char *) sl.buf + sl.len, pl->ob->name); |
|
|
1234 | sl.len += strlen (pl->ob->name); |
|
|
1235 | |
1211 | |
1236 | Send_With_Handling (&pl->socket, &sl); |
1212 | Send_With_Handling (&pl->socket, &sl); |
1237 | free (sl.buf); |
1213 | sl.free (); |
1238 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1214 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1239 | } |
1215 | } |
1240 | |
1216 | |
1241 | /** |
1217 | /** |
1242 | * Need to send an animation sequence to the client. |
1218 | * Need to send an animation sequence to the client. |
… | |
… | |
1246 | * when the player logs in and picks stuff up. |
1222 | * when the player logs in and picks stuff up. |
1247 | */ |
1223 | */ |
1248 | void |
1224 | void |
1249 | esrv_send_animation (NewSocket * ns, short anim_num) |
1225 | esrv_send_animation (NewSocket * ns, short anim_num) |
1250 | { |
1226 | { |
1251 | SockList sl; |
|
|
1252 | int i; |
1227 | int i; |
1253 | |
1228 | |
1254 | /* 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 |
1255 | * 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 |
1256 | * range, it must be a valid animation. |
1231 | * range, it must be a valid animation. |
… | |
… | |
1259 | { |
1234 | { |
1260 | 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); |
1261 | return; |
1236 | return; |
1262 | } |
1237 | } |
1263 | |
1238 | |
1264 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1239 | SockList sl (MAXSOCKBUF); |
1265 | strcpy ((char *) sl.buf, "anim "); |
1240 | |
1266 | sl.len = 5; |
1241 | sl << "anim " |
1267 | SockList_AddShort (&sl, anim_num); |
1242 | << uint16 (anim_num) |
1268 | SockList_AddShort (&sl, 0); /* flags - not used right now */ |
1243 | << uint16 (0); /* flags - not used right now */ |
|
|
1244 | |
1269 | /* 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 |
1270 | * the face itself) down to the client. |
1246 | * the face itself) down to the client. |
1271 | */ |
1247 | */ |
1272 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1248 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1273 | { |
1249 | { |
1274 | 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)) |
1275 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1251 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1276 | 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 */ |
1277 | } |
1253 | } |
|
|
1254 | |
1278 | Send_With_Handling (ns, &sl); |
1255 | Send_With_Handling (ns, &sl); |
1279 | free (sl.buf); |
1256 | sl.free (); |
|
|
1257 | |
1280 | ns->anims_sent[anim_num] = 1; |
1258 | ns->anims_sent[anim_num] = 1; |
1281 | } |
1259 | } |
1282 | |
1260 | |
1283 | |
1261 | |
1284 | /****************************************************************************** |
1262 | /****************************************************************************** |
… | |
… | |
1298 | { |
1276 | { |
1299 | 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); |
1300 | return; |
1278 | return; |
1301 | abort (); |
1279 | abort (); |
1302 | } |
1280 | } |
|
|
1281 | |
1303 | 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; |
1304 | newmap->cells[x][y].count++; |
1283 | newmap->cells[x][y].count++; |
|
|
1284 | |
1305 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1285 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1306 | esrv_send_face (ns, face_num, 0); |
1286 | esrv_send_face (ns, face_num, 0); |
1307 | } |
1287 | } |
1308 | |
1288 | |
1309 | struct LayerCell |
1289 | struct LayerCell |
… | |
… | |
1416 | static void |
1396 | static void |
1417 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1397 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1418 | { |
1398 | { |
1419 | static long frames, bytes, tbytes, tframes; |
1399 | static long frames, bytes, tbytes, tframes; |
1420 | char *cur; |
1400 | char *cur; |
1421 | SockList sl; |
|
|
1422 | |
1401 | |
1423 | |
1402 | SockList sl (MAXSOCKBUF); |
1424 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1403 | sl << "map "; |
1425 | strcpy ((char *) sl.buf, "map "); |
|
|
1426 | sl.len = strlen ((char *) sl.buf); |
|
|
1427 | |
1404 | |
1428 | 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); |
1429 | sl.len = cur - (char *) sl.buf; |
1406 | sl.len = cur - (char *) sl.buf; |
1430 | |
1407 | |
1431 | /* LOG(llevDebug, "Sending map command.\n");*/ |
1408 | /* LOG(llevDebug, "Sending map command.\n");*/ |
… | |
… | |
1443 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1420 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1444 | Send_With_Handling (ns, &sl); |
1421 | Send_With_Handling (ns, &sl); |
1445 | ns->sent_scroll = 0; |
1422 | ns->sent_scroll = 0; |
1446 | } |
1423 | } |
1447 | |
1424 | |
1448 | free (sl.buf); |
1425 | sl.free (); |
1449 | } |
1426 | } |
1450 | |
1427 | |
1451 | |
1428 | |
1452 | /** Clears a map cell */ |
1429 | /** Clears a map cell */ |
1453 | static void |
1430 | static void |
… | |
… | |
1495 | * 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 |
1496 | * 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 |
1497 | * sent, it returns zero. |
1474 | * sent, it returns zero. |
1498 | */ |
1475 | */ |
1499 | static int |
1476 | static int |
1500 | 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) |
1501 | { |
1478 | { |
1502 | short face_num; |
1479 | short face_num; |
1503 | |
1480 | |
1504 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1481 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1505 | 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; |
1506 | else |
1483 | else |
1507 | face_num = 0; |
1484 | face_num = 0; |
1508 | |
1485 | |
1509 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1486 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1510 | { |
1487 | { |
1511 | SockList_AddShort (&sl, face_num); |
1488 | sl << uint16 (face_num); |
1512 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1489 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1513 | esrv_send_face (&ns, face_num, 0); |
1490 | esrv_send_face (&ns, face_num, 0); |
|
|
1491 | |
1514 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1492 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1515 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1493 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1516 | return 1; |
1494 | return 1; |
1517 | } |
1495 | } |
1518 | |
1496 | |
… | |
… | |
1538 | * 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 |
1539 | * actually match. |
1517 | * actually match. |
1540 | */ |
1518 | */ |
1541 | |
1519 | |
1542 | static int |
1520 | static int |
1543 | 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) |
1544 | { |
1522 | { |
1545 | object *ob, *head; |
1523 | object *ob, *head; |
1546 | uint16 face_num; |
1524 | uint16 face_num; |
1547 | int bx, by, i; |
1525 | int bx, by, i; |
1548 | |
1526 | |
1549 | /* 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. |
1550 | * If not, then do the normal processing. |
1528 | * If not, then do the normal processing. |
1551 | */ |
1529 | */ |
1552 | |
|
|
1553 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1530 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1554 | |
1531 | |
1555 | /* 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 |
1556 | * we would normally send for this space. If so, then |
1533 | * we would normally send for this space. If so, then |
1557 | * 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 |
… | |
… | |
1722 | |
1699 | |
1723 | /* 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 |
1724 | * 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 |
1725 | * this one. |
1702 | * this one. |
1726 | */ |
1703 | */ |
1727 | 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) |
1728 | { |
|
|
1729 | face_num = 0; |
1705 | face_num = 0; |
1730 | } |
|
|
1731 | |
1706 | |
1732 | /* 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 |
1733 | * 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. |
1734 | */ |
1709 | */ |
1735 | if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) |
1710 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1736 | { |
1711 | { |
1737 | ns->lastmap.cells[sx][sy].faces[layer] = face_num; |
1712 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1738 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1713 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1739 | esrv_send_face (ns, face_num, 0); |
1714 | esrv_send_face (&ns, face_num, 0); |
1740 | SockList_AddShort (sl, face_num); |
1715 | |
|
|
1716 | sl << uint16 (face_num); |
1741 | return 1; |
1717 | return 1; |
1742 | } |
1718 | } |
|
|
1719 | |
1743 | /* Nothing changed */ |
1720 | /* Nothing changed */ |
1744 | return 0; |
1721 | return 0; |
1745 | } |
1722 | } |
1746 | |
1723 | |
1747 | /** |
1724 | /** |
… | |
… | |
1762 | * 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 |
1763 | * take. |
1740 | * take. |
1764 | */ |
1741 | */ |
1765 | |
1742 | |
1766 | static inline int |
1743 | static inline int |
1767 | 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) |
1768 | { |
1745 | { |
1769 | object *ob; |
1746 | object *ob; |
1770 | int smoothlevel; /* old face_num; */ |
1747 | int smoothlevel; /* old face_num; */ |
1771 | |
1748 | |
1772 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1749 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1777 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1754 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1778 | smoothlevel = 0; |
1755 | smoothlevel = 0; |
1779 | else |
1756 | else |
1780 | { |
1757 | { |
1781 | smoothlevel = ob->smoothlevel; |
1758 | smoothlevel = ob->smoothlevel; |
1782 | if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1759 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1783 | SendSmooth (ns, ob->face->number); |
1760 | SendSmooth (&ns, ob->face->number); |
1784 | } /* else not already head object or blank face */ |
1761 | } /* else not already head object or blank face */ |
1785 | |
1762 | |
1786 | /* 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 |
1787 | * 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. |
1788 | */ |
1765 | */ |
1789 | if (smoothlevel > 255) |
1766 | if (smoothlevel > 255) |
1790 | smoothlevel = 255; |
1767 | smoothlevel = 255; |
1791 | else if (smoothlevel < 0) |
1768 | else if (smoothlevel < 0) |
1792 | smoothlevel = 0; |
1769 | smoothlevel = 0; |
|
|
1770 | |
1793 | if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1771 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1794 | { |
1772 | { |
1795 | ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1773 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1796 | SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); |
1774 | sl << uint8 (smoothlevel); |
1797 | return 1; |
1775 | return 1; |
1798 | } |
1776 | } |
|
|
1777 | |
1799 | /* Nothing changed */ |
1778 | /* Nothing changed */ |
1800 | return 0; |
1779 | return 0; |
1801 | } |
1780 | } |
1802 | |
1781 | |
1803 | /** |
1782 | /** |
… | |
… | |
1844 | draw_client_map1 (object *pl) |
1823 | draw_client_map1 (object *pl) |
1845 | { |
1824 | { |
1846 | 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; |
1847 | sint16 nx, ny; |
1826 | sint16 nx, ny; |
1848 | int estartlen, eoldlen; |
1827 | int estartlen, eoldlen; |
1849 | SockList sl; |
|
|
1850 | SockList esl; /*For extended Map info */ |
|
|
1851 | uint16 mask, emask; |
1828 | uint16 mask, emask; |
1852 | uint8 eentrysize; |
1829 | uint8 eentrysize; |
1853 | uint16 ewhatstart, ewhatflag; |
1830 | uint16 ewhatstart, ewhatflag; |
1854 | uint8 extendedinfos; |
1831 | uint8 extendedinfos; |
1855 | maptile *m; |
1832 | maptile *m; |
1856 | |
1833 | |
1857 | NewSocket & socket = pl->contr->socket; |
1834 | NewSocket &socket = pl->contr->socket; |
1858 | |
1835 | |
1859 | check_map_change (pl->contr); |
1836 | check_map_change (pl->contr); |
1860 | |
1837 | |
1861 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1838 | SockList sl (MAXSOCKBUF); |
1862 | if (socket.mapmode == Map1Cmd) |
1839 | SockList esl (MAXSOCKBUF); |
1863 | strcpy ((char *) sl.buf, "map1 "); |
1840 | |
1864 | else |
1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1865 | strcpy ((char *) sl.buf, "map1a "); |
|
|
1866 | sl.len = strlen ((char *) sl.buf); |
|
|
1867 | startlen = sl.len; |
1842 | startlen = sl.len; |
1868 | |
1843 | |
1869 | /*Extendedmapinfo structure initialisation */ |
1844 | /*Extendedmapinfo structure initialisation */ |
1870 | if (socket.ext_mapinfos) |
1845 | if (socket.ext_mapinfos) |
1871 | { |
1846 | { |
1872 | esl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1873 | strcpy ((char *) esl.buf, "mapextended "); |
|
|
1874 | esl.len = strlen ((char *) esl.buf); |
|
|
1875 | extendedinfos = EMI_NOREDRAW; |
1847 | extendedinfos = EMI_NOREDRAW; |
1876 | |
1848 | |
1877 | if (socket.EMI_smooth) |
1849 | if (socket.EMI_smooth) |
1878 | extendedinfos |= EMI_SMOOTH; |
1850 | extendedinfos |= EMI_SMOOTH; |
1879 | |
1851 | |
1880 | ewhatstart = esl.len; |
1852 | ewhatstart = esl.len; |
1881 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1882 | could need to be taken away */ |
1854 | could need to be taken away */ |
1883 | SockList_AddChar (&esl, extendedinfos); |
|
|
1884 | eentrysize = getExtendedMapInfoSize (&socket); |
1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1885 | SockList_AddChar (&esl, eentrysize); |
1856 | esl << "mapextended " |
|
|
1857 | << uint8 (extendedinfos) |
|
|
1858 | << uint8 (eentrysize); |
1886 | estartlen = esl.len; |
1859 | estartlen = esl.len; |
1887 | } |
1860 | } |
1888 | else |
1861 | else |
1889 | { |
1862 | { |
1890 | /* suppress compiler warnings */ |
1863 | /* suppress compiler warnings */ |
… | |
… | |
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. |
… | |
… | |
1985 | * 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 |
1986 | * of the map, it shouldn't have a head |
1956 | * of the map, it shouldn't have a head |
1987 | */ |
1957 | */ |
1988 | if (lastcell.count != -1) |
1958 | if (lastcell.count != -1) |
1989 | { |
1959 | { |
1990 | SockList_AddShort (&sl, mask); |
1960 | sl << uint16 (mask); |
1991 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1961 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1992 | } |
1962 | } |
1993 | } |
1963 | } |
1994 | else if (d > 3) |
1964 | else if (d > 3) |
1995 | { |
1965 | { |
… | |
… | |
1999 | * reason. Still may need to send the head for this space. |
1969 | * reason. Still may need to send the head for this space. |
2000 | */ |
1970 | */ |
2001 | |
1971 | |
2002 | oldlen = sl.len; |
1972 | oldlen = sl.len; |
2003 | |
1973 | |
2004 | SockList_AddShort (&sl, mask); |
1974 | sl << uint16 (mask); |
2005 | |
1975 | |
2006 | if (lastcell.count != -1) |
1976 | if (lastcell.count != -1) |
2007 | need_send = 1; |
1977 | need_send = 1; |
2008 | |
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 | } |
1990 | } |
2024 | else |
1991 | else |
2025 | { |
1992 | { |
… | |
… | |
2054 | */ |
2021 | */ |
2055 | oldlen = sl.len; |
2022 | oldlen = sl.len; |
2056 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2057 | eoldlen = esl.len; |
2024 | eoldlen = esl.len; |
2058 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2059 | SockList_AddShort (&sl, mask); |
2026 | sl << uint16 (mask); |
2060 | |
2027 | |
2061 | if (socket.ext_mapinfos) |
2028 | if (socket.ext_mapinfos) |
2062 | SockList_AddShort (&esl, emask); |
2029 | esl << uint16 (emask); |
2063 | |
2030 | |
2064 | unsigned char dummy; |
2031 | unsigned char dummy; |
2065 | unsigned char *last_ext = &dummy; |
2032 | unsigned char *last_ext = &dummy; |
2066 | |
2033 | |
2067 | /* Darkness changed */ |
2034 | /* Darkness changed */ |
… | |
… | |
2071 | |
2038 | |
2072 | if (socket.extmap) |
2039 | if (socket.extmap) |
2073 | { |
2040 | { |
2074 | *last_ext |= 0x80; |
2041 | *last_ext |= 0x80; |
2075 | last_ext = sl.buf + sl.len; |
2042 | last_ext = sl.buf + sl.len; |
2076 | SockList_AddChar (&sl, d); |
2043 | sl << uint8 (d); |
2077 | } |
2044 | } |
2078 | else |
2045 | else |
2079 | SockList_AddChar (&sl, 255 - 64 * d); |
2046 | sl << uint8 (255 - 64 * d); |
2080 | } |
2047 | } |
2081 | |
2048 | |
2082 | lastcell.count = d; |
2049 | lastcell.count = d; |
2083 | |
2050 | |
2084 | if (socket.extmap) |
2051 | if (socket.extmap) |
2085 | { |
2052 | { |
2086 | uint8 stat_hp = 0; |
2053 | uint8 stat_hp = 0; |
2087 | uint8 stat_width = 0; |
2054 | uint8 stat_width = 0; |
2088 | uint8 flags = 0; |
2055 | uint8 flags = 0; |
2089 | tag_t player = 0; |
2056 | UUID player = 0; |
2090 | |
2057 | |
2091 | // send hp information, if applicable |
2058 | // send hp information, if applicable |
2092 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2059 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2093 | { |
2060 | { |
2094 | if (op->head || op->invisible) |
2061 | if (op->head || op->invisible) |
… | |
… | |
2115 | lastcell.stat_hp = stat_hp; |
2082 | lastcell.stat_hp = stat_hp; |
2116 | |
2083 | |
2117 | mask |= 0x8; |
2084 | mask |= 0x8; |
2118 | *last_ext |= 0x80; |
2085 | *last_ext |= 0x80; |
2119 | last_ext = sl.buf + sl.len; |
2086 | last_ext = sl.buf + sl.len; |
2120 | SockList_AddChar (&sl, 5); |
2087 | |
2121 | SockList_AddChar (&sl, stat_hp); |
2088 | sl << uint8 (5) << uint8 (stat_hp); |
2122 | |
2089 | |
2123 | if (stat_width > 1) |
2090 | if (stat_width > 1) |
2124 | { |
2091 | { |
2125 | *last_ext |= 0x80; |
2092 | *last_ext |= 0x80; |
2126 | last_ext = sl.buf + sl.len; |
2093 | last_ext = sl.buf + sl.len; |
2127 | SockList_AddChar (&sl, 6); |
2094 | |
2128 | SockList_AddChar (&sl, stat_width); |
2095 | sl << uint8 (6) << uint8 (stat_width); |
2129 | } |
2096 | } |
2130 | } |
2097 | } |
2131 | |
2098 | |
2132 | if (lastcell.player != player) |
2099 | if (lastcell.player != player) |
2133 | { |
2100 | { |
2134 | lastcell.player = player; |
2101 | lastcell.player = player; |
2135 | |
2102 | |
2136 | mask |= 0x8; |
2103 | mask |= 0x8; |
2137 | *last_ext |= 0x80; |
2104 | *last_ext |= 0x80; |
2138 | last_ext = sl.buf + sl.len; |
2105 | last_ext = sl.buf + sl.len; |
2139 | SockList_AddChar (&sl, 0x47); |
2106 | |
2140 | SockList_AddChar (&sl, 4); |
2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2141 | SockList_AddInt (&sl, player); |
|
|
2142 | } |
2108 | } |
2143 | |
2109 | |
2144 | if (lastcell.flags != flags) |
2110 | if (lastcell.flags != flags) |
2145 | { |
2111 | { |
2146 | lastcell.flags = flags; |
2112 | lastcell.flags = flags; |
2147 | |
2113 | |
2148 | mask |= 0x8; |
2114 | mask |= 0x8; |
2149 | *last_ext |= 0x80; |
2115 | *last_ext |= 0x80; |
2150 | last_ext = sl.buf + sl.len; |
2116 | last_ext = sl.buf + sl.len; |
2151 | SockList_AddChar (&sl, 8); |
2117 | |
2152 | SockList_AddChar (&sl, flags); |
2118 | sl << uint8 (8) << uint8 (flags); |
2153 | } |
2119 | } |
2154 | } |
2120 | } |
2155 | |
2121 | |
2156 | /* Floor face */ |
2122 | /* Floor face */ |
2157 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) |
2123 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
2158 | mask |= 0x4; |
2124 | mask |= 0x4; |
2159 | |
2125 | |
2160 | if (socket.EMI_smooth) |
2126 | if (socket.EMI_smooth) |
2161 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) |
2127 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
2162 | emask |= 0x4; |
2128 | emask |= 0x4; |
2163 | |
2129 | |
2164 | /* Middle face */ |
2130 | /* Middle face */ |
2165 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) |
2131 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
2166 | mask |= 0x2; |
2132 | mask |= 0x2; |
2167 | |
2133 | |
2168 | if (socket.EMI_smooth) |
2134 | if (socket.EMI_smooth) |
2169 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) |
2135 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
2170 | emask |= 0x2; |
2136 | emask |= 0x2; |
2171 | |
2137 | |
2172 | 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)) |
2173 | { |
2139 | { |
2174 | if (lastcell.faces[0] != pl->face->number) |
2140 | if (lastcell.faces[0] != pl->face->number) |
… | |
… | |
2177 | mask |= 0x1; |
2143 | mask |= 0x1; |
2178 | |
2144 | |
2179 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2145 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2180 | esrv_send_face (&socket, pl->face->number, 0); |
2146 | esrv_send_face (&socket, pl->face->number, 0); |
2181 | |
2147 | |
2182 | SockList_AddShort (&sl, pl->face->number); |
2148 | sl << uint16 (pl->face->number); |
2183 | } |
2149 | } |
2184 | } |
2150 | } |
2185 | else |
2151 | else |
2186 | { |
2152 | { |
2187 | /* Top face */ |
2153 | /* Top face */ |
2188 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) |
2154 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
2189 | mask |= 0x1; |
2155 | mask |= 0x1; |
2190 | |
2156 | |
2191 | if (socket.EMI_smooth) |
2157 | if (socket.EMI_smooth) |
2192 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) |
2158 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
2193 | emask |= 0x1; |
2159 | emask |= 0x1; |
2194 | } |
2160 | } |
2195 | |
2161 | |
2196 | /* 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 |
2197 | * space by checking the mask. If so, update the mask. |
2163 | * space by checking the mask. If so, update the mask. |
… | |
… | |
2223 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2224 | } |
2190 | } |
2225 | |
2191 | |
2226 | if (esl.len > estartlen) |
2192 | if (esl.len > estartlen) |
2227 | Send_With_Handling (&socket, &esl); |
2193 | Send_With_Handling (&socket, &esl); |
2228 | |
|
|
2229 | free (esl.buf); |
|
|
2230 | } |
2194 | } |
2231 | |
2195 | |
2232 | if (sl.len > startlen || socket.sent_scroll) |
2196 | if (sl.len > startlen || socket.sent_scroll) |
2233 | { |
2197 | { |
2234 | Send_With_Handling (&socket, &sl); |
2198 | Send_With_Handling (&socket, &sl); |
2235 | socket.sent_scroll = 0; |
2199 | socket.sent_scroll = 0; |
2236 | } |
2200 | } |
2237 | |
2201 | |
2238 | free (sl.buf); |
2202 | sl.free (); |
|
|
2203 | esl.free (); |
2239 | } |
2204 | } |
2240 | |
2205 | |
2241 | /** |
2206 | /** |
2242 | * Draws client map. |
2207 | * Draws client map. |
2243 | */ |
2208 | */ |
… | |
… | |
2357 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2322 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2358 | } |
2323 | } |
2359 | } /* Is a valid space */ |
2324 | } /* Is a valid space */ |
2360 | } |
2325 | } |
2361 | } |
2326 | } |
|
|
2327 | |
2362 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2328 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2363 | |
2329 | |
2364 | check_map_change (pl->contr); |
2330 | check_map_change (pl->contr); |
2365 | } |
2331 | } |
2366 | |
2332 | |
… | |
… | |
2383 | /** |
2349 | /** |
2384 | * This sends the skill number to name mapping. We ignore |
2350 | * This sends the skill number to name mapping. We ignore |
2385 | * the params - we always send the same info no matter what. |
2351 | * the params - we always send the same info no matter what. |
2386 | */ |
2352 | */ |
2387 | void |
2353 | void |
2388 | send_skill_info (NewSocket * ns, char *params) |
2354 | send_skill_info (NewSocket *ns, char *params) |
2389 | { |
2355 | { |
2390 | SockList sl; |
2356 | SockList sl (MAXSOCKBUF); |
2391 | int i; |
2357 | sl << "replyinfo skill_info\n"; |
2392 | |
2358 | |
2393 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2394 | strcpy ((char *) sl.buf, "replyinfo skill_info\n"); |
|
|
2395 | for (i = 1; i < NUM_SKILLS; i++) |
2359 | for (int i = 1; i < NUM_SKILLS; i++) |
2396 | { |
2360 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2397 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2361 | |
2398 | } |
|
|
2399 | sl.len = strlen ((char *) sl.buf); |
|
|
2400 | if (sl.len >= MAXSOCKBUF) |
2362 | if (sl.len >= MAXSOCKBUF) |
2401 | { |
2363 | { |
2402 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2364 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2403 | fatal (0); |
2365 | fatal (0); |
2404 | } |
2366 | } |
|
|
2367 | |
2405 | Send_With_Handling (ns, &sl); |
2368 | Send_With_Handling (ns, &sl); |
2406 | free (sl.buf); |
2369 | sl.free (); |
2407 | } |
2370 | } |
2408 | |
2371 | |
2409 | /** |
2372 | /** |
2410 | * This sends the spell path to name mapping. We ignore |
2373 | * This sends the spell path to name mapping. We ignore |
2411 | * the params - we always send the same info no matter what. |
2374 | * the params - we always send the same info no matter what. |
2412 | */ |
2375 | */ |
2413 | void |
2376 | void |
2414 | send_spell_paths (NewSocket * ns, char *params) |
2377 | send_spell_paths (NewSocket * ns, char *params) |
2415 | { |
2378 | { |
2416 | SockList sl; |
2379 | SockList sl (MAXSOCKBUF); |
2417 | int i; |
|
|
2418 | |
2380 | |
2419 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2381 | sl << "replyinfo spell_paths\n"; |
2420 | strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); |
2382 | |
2421 | for (i = 0; i < NRSPELLPATHS; i++) |
2383 | for (int i = 0; i < NRSPELLPATHS; i++) |
2422 | 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]); |
2423 | sl.len = strlen ((char *) sl.buf); |
2385 | |
2424 | if (sl.len >= MAXSOCKBUF) |
2386 | if (sl.len >= MAXSOCKBUF) |
2425 | { |
2387 | { |
2426 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2388 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2427 | fatal (0); |
2389 | fatal (0); |
2428 | } |
2390 | } |
|
|
2391 | |
2429 | Send_With_Handling (ns, &sl); |
2392 | Send_With_Handling (ns, &sl); |
2430 | free (sl.buf); |
2393 | sl.free (); |
2431 | } |
2394 | } |
2432 | |
2395 | |
2433 | /** |
2396 | /** |
2434 | * 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. |
2435 | * 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 |
2436 | */ |
2399 | */ |
2437 | void |
2400 | void |
2438 | esrv_update_spells (player *pl) |
2401 | esrv_update_spells (player *pl) |
2439 | { |
2402 | { |
2440 | SockList sl; |
|
|
2441 | int flags = 0; |
|
|
2442 | object *spell; |
|
|
2443 | |
|
|
2444 | if (!pl->socket.monitor_spells) |
2403 | if (!pl->socket.monitor_spells) |
2445 | return; |
2404 | return; |
|
|
2405 | |
2446 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2406 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2447 | { |
2407 | { |
2448 | if (spell->type == SPELL) |
2408 | if (spell->type == SPELL) |
2449 | { |
2409 | { |
|
|
2410 | int flags = 0; |
|
|
2411 | |
2450 | /* check if we need to update it */ |
2412 | /* check if we need to update it */ |
2451 | 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)) |
2452 | { |
2414 | { |
2453 | 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); |
2454 | flags |= UPD_SP_MANA; |
2416 | flags |= UPD_SP_MANA; |
2455 | } |
2417 | } |
|
|
2418 | |
2456 | 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)) |
2457 | { |
2420 | { |
2458 | 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); |
2459 | flags |= UPD_SP_GRACE; |
2422 | flags |= UPD_SP_GRACE; |
2460 | } |
2423 | } |
|
|
2424 | |
2461 | 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)) |
2462 | { |
2426 | { |
2463 | 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); |
2464 | flags |= UPD_SP_DAMAGE; |
2428 | flags |= UPD_SP_DAMAGE; |
2465 | } |
2429 | } |
|
|
2430 | |
2466 | if (flags != 0) |
2431 | if (flags) |
2467 | { |
2432 | { |
2468 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2433 | SockList sl (MAXSOCKBUF); |
2469 | strcpy ((char *) sl.buf, "updspell "); |
2434 | |
2470 | sl.len = strlen ((char *) sl.buf); |
2435 | sl << "updspell " |
2471 | SockList_AddChar (&sl, flags); |
2436 | << uint8 (flags) |
2472 | SockList_AddInt (&sl, spell->count); |
2437 | << uint32 (spell->count); |
2473 | if (flags & UPD_SP_MANA) |
2438 | |
2474 | SockList_AddShort (&sl, spell->last_sp); |
2439 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2475 | if (flags & UPD_SP_GRACE) |
2440 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2476 | SockList_AddShort (&sl, spell->last_grace); |
2441 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2477 | if (flags & UPD_SP_DAMAGE) |
2442 | |
2478 | SockList_AddShort (&sl, spell->last_eat); |
|
|
2479 | flags = 0; |
|
|
2480 | Send_With_Handling (&pl->socket, &sl); |
2443 | Send_With_Handling (&pl->socket, &sl); |
2481 | free (sl.buf); |
2444 | sl.free (); |
2482 | } |
2445 | } |
2483 | } |
2446 | } |
2484 | } |
2447 | } |
2485 | } |
2448 | } |
2486 | |
2449 | |
2487 | void |
2450 | void |
2488 | esrv_remove_spell (player *pl, object *spell) |
2451 | esrv_remove_spell (player *pl, object *spell) |
2489 | { |
2452 | { |
2490 | SockList sl; |
|
|
2491 | |
|
|
2492 | if (!pl->socket.monitor_spells) |
2453 | if (!pl->socket.monitor_spells) |
2493 | return; |
2454 | return; |
|
|
2455 | |
2494 | if (!pl || !spell || spell->env != pl->ob) |
2456 | if (!pl || !spell || spell->env != pl->ob) |
2495 | { |
2457 | { |
2496 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2458 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2497 | return; |
2459 | return; |
2498 | } |
2460 | } |
2499 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2461 | |
2500 | strcpy ((char *) sl.buf, "delspell "); |
2462 | SockList sl (MAXSOCKBUF); |
2501 | sl.len = strlen ((char *) sl.buf); |
2463 | |
2502 | SockList_AddInt (&sl, spell->count); |
2464 | sl << "delspell " |
|
|
2465 | << uint32 (spell->count); |
|
|
2466 | |
2503 | Send_With_Handling (&pl->socket, &sl); |
2467 | Send_With_Handling (&pl->socket, &sl); |
2504 | free (sl.buf); |
2468 | sl.free (); |
2505 | } |
2469 | } |
2506 | |
2470 | |
2507 | /* 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. */ |
2508 | static void |
2472 | static void |
2509 | append_spell (player *pl, SockList * sl, object *spell) |
2473 | append_spell (player *pl, SockList &sl, object *spell) |
2510 | { |
2474 | { |
2511 | int len, i, skill = 0; |
2475 | int len, i, skill = 0; |
2512 | |
2476 | |
2513 | if (!(spell->name)) |
2477 | if (!(spell->name)) |
2514 | { |
2478 | { |
2515 | 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); |
2516 | return; |
2480 | return; |
2517 | } |
2481 | } |
2518 | SockList_AddInt (sl, spell->count); |
2482 | |
2519 | SockList_AddShort (sl, spell->level); |
|
|
2520 | SockList_AddShort (sl, spell->casting_time); |
|
|
2521 | /* 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 */ |
2522 | 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); |
2523 | 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); |
2524 | 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); |
2525 | /* send the current values */ |
|
|
2526 | SockList_AddShort (sl, spell->last_sp); |
|
|
2527 | SockList_AddShort (sl, spell->last_grace); |
|
|
2528 | SockList_AddShort (sl, spell->last_eat); |
|
|
2529 | |
2487 | |
2530 | /* figure out which skill it uses, if it uses one */ |
2488 | /* figure out which skill it uses, if it uses one */ |
2531 | if (spell->skill) |
2489 | if (spell->skill) |
2532 | { |
2490 | { |
2533 | for (i = 1; i < NUM_SKILLS; i++) |
2491 | for (i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2535 | { |
2493 | { |
2536 | skill = i + CS_STAT_SKILLINFO; |
2494 | skill = i + CS_STAT_SKILLINFO; |
2537 | break; |
2495 | break; |
2538 | } |
2496 | } |
2539 | } |
2497 | } |
2540 | SockList_AddChar (sl, skill); |
|
|
2541 | |
2498 | |
2542 | 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) |
2543 | SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); |
2508 | << uint32 (spell->face ? spell->face->number : 0) |
2544 | |
2509 | << data8 (spell->name) |
2545 | len = strlen (spell->name); |
2510 | << data16 (spell->msg); |
2546 | SockList_AddChar (sl, (char) len); |
|
|
2547 | memcpy (sl->buf + sl->len, spell->name, len); |
|
|
2548 | sl->len += len; |
|
|
2549 | |
|
|
2550 | if (!spell->msg) |
|
|
2551 | { |
|
|
2552 | SockList_AddShort (sl, 0); |
|
|
2553 | } |
|
|
2554 | else |
|
|
2555 | { |
|
|
2556 | len = strlen (spell->msg); |
|
|
2557 | SockList_AddShort (sl, len); |
|
|
2558 | memcpy (sl->buf + sl->len, spell->msg, len); |
|
|
2559 | sl->len += len; |
|
|
2560 | } |
|
|
2561 | } |
2511 | } |
2562 | |
2512 | |
2563 | /** |
2513 | /** |
2564 | * 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 |
2565 | * all spells in the player's inventory. |
2515 | * all spells in the player's inventory. |
2566 | */ |
2516 | */ |
2567 | void |
2517 | void |
2568 | esrv_add_spells (player *pl, object *spell) |
2518 | esrv_add_spells (player *pl, object *spell) |
2569 | { |
2519 | { |
2570 | SockList sl; |
|
|
2571 | |
|
|
2572 | if (!pl) |
2520 | if (!pl) |
2573 | { |
2521 | { |
2574 | 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"); |
2575 | return; |
2523 | return; |
2576 | } |
2524 | } |
|
|
2525 | |
2577 | if (!pl->socket.monitor_spells) |
2526 | if (!pl->socket.monitor_spells) |
2578 | return; |
2527 | return; |
2579 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2528 | |
2580 | strcpy ((char *) sl.buf, "addspell "); |
2529 | SockList sl (MAXSOCKBUF); |
2581 | sl.len = strlen ((char *) sl.buf); |
2530 | |
|
|
2531 | sl << "addspell "; |
|
|
2532 | |
2582 | if (!spell) |
2533 | if (!spell) |
2583 | { |
2534 | { |
2584 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2535 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2585 | { |
2536 | { |
2586 | /* were we to simply keep appending data here, we could exceed |
2537 | /* were we to simply keep appending data here, we could exceed |
… | |
… | |
2596 | * 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 |
2597 | * like it will fix this |
2548 | * like it will fix this |
2598 | */ |
2549 | */ |
2599 | if (spell->type != SPELL) |
2550 | if (spell->type != SPELL) |
2600 | continue; |
2551 | continue; |
|
|
2552 | |
2601 | 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)))) |
2602 | { |
2554 | { |
2603 | Send_With_Handling (&pl->socket, &sl); |
2555 | Send_With_Handling (&pl->socket, &sl); |
2604 | strcpy ((char *) sl.buf, "addspell "); |
2556 | strcpy ((char *) sl.buf, "addspell "); |
2605 | sl.len = strlen ((char *) sl.buf); |
2557 | sl.len = strlen ((char *) sl.buf); |
2606 | } |
2558 | } |
|
|
2559 | |
2607 | append_spell (pl, &sl, spell); |
2560 | append_spell (pl, sl, spell); |
2608 | } |
2561 | } |
2609 | } |
2562 | } |
2610 | else if (spell->type != SPELL) |
2563 | else if (spell->type != SPELL) |
2611 | { |
2564 | { |
2612 | 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"); |
2613 | return; |
2566 | return; |
2614 | } |
2567 | } |
2615 | else |
2568 | else |
2616 | append_spell (pl, &sl, spell); |
2569 | append_spell (pl, sl, spell); |
|
|
2570 | |
2617 | if (sl.len >= MAXSOCKBUF) |
2571 | if (sl.length () >= MAXSOCKBUF) |
2618 | { |
2572 | { |
2619 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2573 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2620 | fatal (0); |
2574 | fatal (0); |
2621 | } |
2575 | } |
|
|
2576 | |
2622 | /* finally, we can send the packet */ |
2577 | /* finally, we can send the packet */ |
2623 | Send_With_Handling (&pl->socket, &sl); |
2578 | Send_With_Handling (&pl->socket, &sl); |
2624 | free (sl.buf); |
2579 | |
|
|
2580 | sl.free (); |
2625 | } |
2581 | } |
|
|
2582 | |