… | |
… | |
682 | */ |
682 | */ |
683 | static void |
683 | static void |
684 | SendSmooth (NewSocket * ns, uint16 face) |
684 | SendSmooth (NewSocket * ns, uint16 face) |
685 | { |
685 | { |
686 | uint16 smoothface; |
686 | uint16 smoothface; |
687 | unsigned char reply[MAX_BUF]; |
|
|
688 | SockList sl; |
|
|
689 | |
687 | |
690 | /* 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 |
691 | * again. |
689 | * again. |
692 | */ |
690 | */ |
693 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
691 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
… | |
… | |
701 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
699 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
702 | esrv_send_face (ns, smoothface, 0); |
700 | esrv_send_face (ns, smoothface, 0); |
703 | |
701 | |
704 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
702 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
705 | |
703 | |
706 | sl.buf = reply; |
704 | SockList sl (MAXSOCKBUF); |
707 | strcpy ((char *) sl.buf, "smooth "); |
|
|
708 | sl.len = strlen ((char *) sl.buf); |
|
|
709 | |
705 | |
710 | sl << uint16 (face) << uint16 (smoothface); |
706 | sl << "smooth " |
|
|
707 | << uint16 (face) |
|
|
708 | << uint16 (smoothface); |
711 | |
709 | |
712 | Send_With_Handling (ns, &sl); |
710 | Send_With_Handling (ns, &sl); |
|
|
711 | sl.free (); |
713 | } |
712 | } |
714 | |
713 | |
715 | /** |
714 | /** |
716 | * Tells client the picture it has to use |
715 | * Tells client the picture it has to use |
717 | * to smooth a picture number given as argument. |
716 | * to smooth a picture number given as argument. |
… | |
… | |
723 | |
722 | |
724 | facenbr = atoi (buf); |
723 | facenbr = atoi (buf); |
725 | SendSmooth (ns, facenbr); |
724 | SendSmooth (ns, facenbr); |
726 | } |
725 | } |
727 | |
726 | |
728 | |
|
|
729 | |
|
|
730 | |
|
|
731 | |
|
|
732 | /** |
727 | /** |
733 | * 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, |
734 | * etc.) |
729 | * etc.) |
735 | */ |
730 | */ |
736 | void |
731 | void |
… | |
… | |
789 | */ |
784 | */ |
790 | void |
785 | void |
791 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
786 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
792 | { |
787 | { |
793 | int time, repeat; |
788 | int time, repeat; |
|
|
789 | char command[MAX_BUF]; |
794 | short packet; |
790 | short packet; |
795 | unsigned char command[MAX_BUF]; |
|
|
796 | SockList sl; |
|
|
797 | |
791 | |
798 | if (len < 7) |
792 | if (len < 7) |
799 | { |
793 | { |
800 | 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); |
801 | return; |
795 | return; |
… | |
… | |
803 | |
797 | |
804 | packet = GetShort_String (buf); |
798 | packet = GetShort_String (buf); |
805 | repeat = GetInt_String (buf + 2); |
799 | repeat = GetInt_String (buf + 2); |
806 | /* -1 is special - no repeat, but don't update */ |
800 | /* -1 is special - no repeat, but don't update */ |
807 | if (repeat != -1) |
801 | if (repeat != -1) |
808 | { |
|
|
809 | pl->count = repeat; |
802 | pl->count = repeat; |
810 | } |
803 | |
811 | if ((len - 4) >= MAX_BUF) |
804 | if ((len - 4) >= MAX_BUF) |
812 | len = MAX_BUF - 5; |
805 | len = MAX_BUF - 5; |
813 | |
806 | |
814 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
807 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
815 | command[len - 4] = '\0'; |
808 | command[len - 4] = '\0'; |
… | |
… | |
825 | return; |
818 | return; |
826 | } |
819 | } |
827 | |
820 | |
828 | /* This should not happen anymore. */ |
821 | /* This should not happen anymore. */ |
829 | if (pl->ob->speed_left < -1.0) |
822 | if (pl->ob->speed_left < -1.0) |
830 | { |
|
|
831 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
823 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
832 | } |
824 | |
833 | /* In c_new.c */ |
825 | /* In c_new.c */ |
834 | execute_newserver_command (pl->ob, (char *) command); |
826 | execute_newserver_command (pl->ob, (char *) command); |
835 | /* Perhaps something better should be done with a left over count. |
827 | /* Perhaps something better should be done with a left over count. |
836 | * Cleaning up the input should probably be done first - all actions |
828 | * Cleaning up the input should probably be done first - all actions |
837 | * for the command that issued the count should be done before any other |
829 | * for the command that issued the count should be done before any other |
838 | * commands. |
830 | * commands. |
839 | */ |
831 | */ |
840 | pl->count = 0; |
832 | pl->count = 0; |
841 | |
833 | |
842 | /* Send confirmation of command execution now */ |
|
|
843 | sl.buf = command; |
|
|
844 | strcpy ((char *) sl.buf, "comc "); |
|
|
845 | sl.len = 5; |
|
|
846 | |
|
|
847 | if (FABS (pl->ob->speed) < 0.001) |
834 | if (FABS (pl->ob->speed) < 0.001) |
848 | time = MAX_TIME * 100; |
835 | time = MAX_TIME * 100; |
849 | else |
836 | else |
850 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
837 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
851 | |
838 | |
|
|
839 | /* Send confirmation of command execution now */ |
|
|
840 | |
|
|
841 | SockList sl (MAXSOCKBUF); |
852 | sl << uint16 (packet) << uint32 (time); |
842 | sl << "comc " << uint16 (packet) << uint32 (time); |
853 | |
|
|
854 | Send_With_Handling (&pl->socket, &sl); |
843 | Send_With_Handling (&pl->socket, &sl); |
|
|
844 | sl.free (); |
855 | } |
845 | } |
856 | |
846 | |
857 | |
847 | |
858 | /** This is a reply to a previous query. */ |
848 | /** This is a reply to a previous query. */ |
859 | void |
849 | void |
… | |
… | |
1062 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1052 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1063 | } |
1053 | } |
1064 | |
1054 | |
1065 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1055 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1066 | Old = New; \ |
1056 | Old = New; \ |
1067 | SockList_AddChar(&sl, Type); \ |
1057 | sl << uint8 (Type) << uint64 (New); \ |
1068 | SockList_AddInt64(&sl, New); \ |
|
|
1069 | } |
1058 | } |
1070 | |
1059 | |
1071 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1060 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1072 | Old = New; \ |
1061 | Old = New; \ |
1073 | SockList_AddChar(&sl, Type); \ |
1062 | sl << uint8 (Type) << uint32 (New); \ |
1074 | SockList_AddInt(&sl, New); \ |
|
|
1075 | } |
1063 | } |
1076 | |
1064 | |
1077 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1065 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1078 | Old = New; \ |
1066 | Old = New; \ |
1079 | SockList_AddChar(&sl, Type); \ |
1067 | sl << uint8 (Type) << uint16 (New); \ |
1080 | SockList_AddShort(&sl, New); \ |
|
|
1081 | } |
1068 | } |
1082 | |
1069 | |
1083 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1070 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1084 | Old = New; \ |
1071 | Old = New; \ |
1085 | SockList_AddChar(&sl, Type); \ |
1072 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
1086 | SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ |
|
|
1087 | } |
1073 | } |
1088 | |
1074 | |
1089 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1075 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1090 | if (Old) free(Old);\ |
|
|
1091 | Old = strdup_local(New);\ |
1076 | free(Old); Old = strdup (New);\ |
1092 | SockList_AddChar(&sl, Type); \ |
1077 | sl << uint8 (Type) << data8 (New); \ |
1093 | SockList_AddChar(&sl, ( char )strlen(New)); \ |
|
|
1094 | strcpy((char*)sl.buf + sl.len, New); \ |
|
|
1095 | sl.len += strlen(New); \ |
|
|
1096 | } |
1078 | } |
1097 | |
1079 | |
1098 | /** |
1080 | /** |
1099 | * Sends a statistics update. We look at the old values, |
1081 | * Sends a statistics update. We look at the old values, |
1100 | * and only send what has changed. Stat mapping values are in newclient.h |
1082 | * and only send what has changed. Stat mapping values are in newclient.h |
… | |
… | |
1102 | * commands for now. |
1084 | * commands for now. |
1103 | */ |
1085 | */ |
1104 | void |
1086 | void |
1105 | esrv_update_stats (player *pl) |
1087 | esrv_update_stats (player *pl) |
1106 | { |
1088 | { |
1107 | SockList sl; |
|
|
1108 | char buf[MAX_BUF]; |
1089 | char buf[MAX_BUF]; |
1109 | uint16 flags; |
1090 | uint16 flags; |
1110 | |
1091 | |
1111 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1092 | SockList sl (MAXSOCKBUF); |
1112 | strcpy ((char *) sl.buf, "stats "); |
1093 | sl << "stats "; |
1113 | sl.len = strlen ((char *) sl.buf); |
|
|
1114 | |
1094 | |
1115 | if (pl->ob != NULL) |
1095 | if (pl->ob != NULL) |
1116 | { |
1096 | { |
1117 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1097 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1118 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1098 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
1135 | |
1115 | |
1136 | for (s = 0; s < NUM_SKILLS; s++) |
1116 | for (s = 0; s < NUM_SKILLS; s++) |
1137 | { |
1117 | { |
1138 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1118 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1139 | { |
1119 | { |
1140 | |
|
|
1141 | /* Always send along the level if exp changes. This is only |
1120 | /* Always send along the level if exp changes. This is only |
1142 | * 1 extra byte, but keeps processing simpler. |
1121 | * 1 extra byte, but keeps processing simpler. |
1143 | */ |
1122 | */ |
1144 | SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); |
1123 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1145 | SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); |
1124 | << uint8 (pl->last_skill_ob[s]->level) |
1146 | SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); |
1125 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
|
|
1126 | |
1147 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1127 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1148 | } |
1128 | } |
1149 | } |
1129 | } |
1150 | } |
1130 | } |
1151 | |
1131 | |
… | |
… | |
1207 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1187 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
1208 | #endif |
1188 | #endif |
1209 | Send_With_Handling (&pl->socket, &sl); |
1189 | Send_With_Handling (&pl->socket, &sl); |
1210 | } |
1190 | } |
1211 | |
1191 | |
1212 | free (sl.buf); |
1192 | sl.free (); |
1213 | } |
1193 | } |
1214 | |
1194 | |
1215 | /** |
1195 | /** |
1216 | * Tells the client that here is a player it should start using. |
1196 | * Tells the client that here is a player it should start using. |
1217 | */ |
1197 | */ |
1218 | void |
1198 | void |
1219 | esrv_new_player (player *pl, uint32 weight) |
1199 | esrv_new_player (player *pl, uint32 weight) |
1220 | { |
1200 | { |
1221 | SockList sl; |
|
|
1222 | |
|
|
1223 | pl->last_weight = weight; |
1201 | pl->last_weight = weight; |
1224 | |
1202 | |
1225 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1203 | SockList sl (MAXSOCKBUF); |
|
|
1204 | sl << "player "; |
1226 | |
1205 | |
1227 | strcpy ((char *) sl.buf, "player "); |
1206 | sl << uint32 (pl->ob->count) |
1228 | sl.len = strlen ((char *) sl.buf); |
1207 | << uint32 (weight) |
1229 | SockList_AddInt (&sl, pl->ob->count); |
1208 | << uint32 (pl->ob->face->number) |
1230 | SockList_AddInt (&sl, weight); |
1209 | << data8 (pl->ob->name); |
1231 | SockList_AddInt (&sl, pl->ob->face->number); |
|
|
1232 | |
|
|
1233 | SockList_AddChar (&sl, (char) strlen (pl->ob->name)); |
|
|
1234 | strcpy ((char *) sl.buf + sl.len, pl->ob->name); |
|
|
1235 | sl.len += strlen (pl->ob->name); |
|
|
1236 | |
1210 | |
1237 | Send_With_Handling (&pl->socket, &sl); |
1211 | Send_With_Handling (&pl->socket, &sl); |
1238 | free (sl.buf); |
1212 | sl.free (); |
1239 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1213 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1240 | } |
1214 | } |
1241 | |
1215 | |
1242 | /** |
1216 | /** |
1243 | * Need to send an animation sequence to the client. |
1217 | * Need to send an animation sequence to the client. |
… | |
… | |
1247 | * when the player logs in and picks stuff up. |
1221 | * when the player logs in and picks stuff up. |
1248 | */ |
1222 | */ |
1249 | void |
1223 | void |
1250 | esrv_send_animation (NewSocket * ns, short anim_num) |
1224 | esrv_send_animation (NewSocket * ns, short anim_num) |
1251 | { |
1225 | { |
1252 | SockList sl; |
|
|
1253 | int i; |
1226 | int i; |
1254 | |
1227 | |
1255 | /* Do some checking on the anim_num we got. Note that the animations |
1228 | /* Do some checking on the anim_num we got. Note that the animations |
1256 | * are added in contigous order, so if the number is in the valid |
1229 | * are added in contigous order, so if the number is in the valid |
1257 | * range, it must be a valid animation. |
1230 | * range, it must be a valid animation. |
… | |
… | |
1260 | { |
1233 | { |
1261 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1234 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1262 | return; |
1235 | return; |
1263 | } |
1236 | } |
1264 | |
1237 | |
1265 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1238 | SockList sl (MAXSOCKBUF); |
1266 | strcpy ((char *) sl.buf, "anim "); |
1239 | |
1267 | sl.len = 5; |
1240 | sl << "anim " |
1268 | SockList_AddShort (&sl, anim_num); |
1241 | << uint16 (anim_num) |
1269 | SockList_AddShort (&sl, 0); /* flags - not used right now */ |
1242 | << uint16 (0); /* flags - not used right now */ |
|
|
1243 | |
1270 | /* Build up the list of faces. Also, send any information (ie, the |
1244 | /* Build up the list of faces. Also, send any information (ie, the |
1271 | * the face itself) down to the client. |
1245 | * the face itself) down to the client. |
1272 | */ |
1246 | */ |
1273 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1247 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1274 | { |
1248 | { |
1275 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1249 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1276 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1250 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1277 | SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ |
1251 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1278 | } |
1252 | } |
|
|
1253 | |
1279 | Send_With_Handling (ns, &sl); |
1254 | Send_With_Handling (ns, &sl); |
1280 | free (sl.buf); |
1255 | sl.free (); |
|
|
1256 | |
1281 | ns->anims_sent[anim_num] = 1; |
1257 | ns->anims_sent[anim_num] = 1; |
1282 | } |
1258 | } |
1283 | |
1259 | |
1284 | |
1260 | |
1285 | /****************************************************************************** |
1261 | /****************************************************************************** |
… | |
… | |
1299 | { |
1275 | { |
1300 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1276 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1301 | return; |
1277 | return; |
1302 | abort (); |
1278 | abort (); |
1303 | } |
1279 | } |
|
|
1280 | |
1304 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1281 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1305 | newmap->cells[x][y].count++; |
1282 | newmap->cells[x][y].count++; |
|
|
1283 | |
1306 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1284 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1307 | esrv_send_face (ns, face_num, 0); |
1285 | esrv_send_face (ns, face_num, 0); |
1308 | } |
1286 | } |
1309 | |
1287 | |
1310 | struct LayerCell |
1288 | struct LayerCell |
… | |
… | |
1417 | static void |
1395 | static void |
1418 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1396 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
1419 | { |
1397 | { |
1420 | static long frames, bytes, tbytes, tframes; |
1398 | static long frames, bytes, tbytes, tframes; |
1421 | char *cur; |
1399 | char *cur; |
1422 | SockList sl; |
|
|
1423 | |
1400 | |
1424 | |
1401 | SockList sl (MAXSOCKBUF); |
1425 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1402 | sl << "map "; |
1426 | strcpy ((char *) sl.buf, "map "); |
|
|
1427 | sl.len = strlen ((char *) sl.buf); |
|
|
1428 | |
1403 | |
1429 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
1404 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
1430 | sl.len = cur - (char *) sl.buf; |
1405 | sl.len = cur - (char *) sl.buf; |
1431 | |
1406 | |
1432 | /* LOG(llevDebug, "Sending map command.\n");*/ |
1407 | /* LOG(llevDebug, "Sending map command.\n");*/ |
… | |
… | |
1444 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1419 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
1445 | Send_With_Handling (ns, &sl); |
1420 | Send_With_Handling (ns, &sl); |
1446 | ns->sent_scroll = 0; |
1421 | ns->sent_scroll = 0; |
1447 | } |
1422 | } |
1448 | |
1423 | |
1449 | free (sl.buf); |
1424 | sl.free (); |
1450 | } |
1425 | } |
1451 | |
1426 | |
1452 | |
1427 | |
1453 | /** Clears a map cell */ |
1428 | /** Clears a map cell */ |
1454 | static void |
1429 | static void |
… | |
… | |
1496 | * needs to get sent - if so, it adds the data, sending the head |
1471 | * needs to get sent - if so, it adds the data, sending the head |
1497 | * if needed, and returning 1. If this no data needs to get |
1472 | * if needed, and returning 1. If this no data needs to get |
1498 | * sent, it returns zero. |
1473 | * sent, it returns zero. |
1499 | */ |
1474 | */ |
1500 | static int |
1475 | static int |
1501 | check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) |
1476 | check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) |
1502 | { |
1477 | { |
1503 | short face_num; |
1478 | short face_num; |
1504 | |
1479 | |
1505 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1480 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1506 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1481 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1510 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1485 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1511 | { |
1486 | { |
1512 | SockList_AddShort (&sl, face_num); |
1487 | SockList_AddShort (&sl, face_num); |
1513 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1488 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1514 | esrv_send_face (&ns, face_num, 0); |
1489 | esrv_send_face (&ns, face_num, 0); |
|
|
1490 | |
1515 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1491 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1516 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1492 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1517 | return 1; |
1493 | return 1; |
1518 | } |
1494 | } |
1519 | |
1495 | |
… | |
… | |
1539 | * the case, it seems to make more sense to have these layer values |
1515 | * the case, it seems to make more sense to have these layer values |
1540 | * actually match. |
1516 | * actually match. |
1541 | */ |
1517 | */ |
1542 | |
1518 | |
1543 | static int |
1519 | static int |
1544 | update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1520 | update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1545 | { |
1521 | { |
1546 | object *ob, *head; |
1522 | object *ob, *head; |
1547 | uint16 face_num; |
1523 | uint16 face_num; |
1548 | int bx, by, i; |
1524 | int bx, by, i; |
1549 | |
1525 | |
1550 | /* If there is a multipart object stored away, treat that as more important. |
1526 | /* If there is a multipart object stored away, treat that as more important. |
1551 | * If not, then do the normal processing. |
1527 | * If not, then do the normal processing. |
1552 | */ |
1528 | */ |
1553 | |
|
|
1554 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1529 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1555 | |
1530 | |
1556 | /* Check to see if this head is part of the set of objects |
1531 | /* Check to see if this head is part of the set of objects |
1557 | * we would normally send for this space. If so, then |
1532 | * we would normally send for this space. If so, then |
1558 | * don't use the head value. We need to do the check |
1533 | * don't use the head value. We need to do the check |
… | |
… | |
1723 | |
1698 | |
1724 | /* Another hack - because of heads and whatnot, this face may match one |
1699 | /* Another hack - because of heads and whatnot, this face may match one |
1725 | * we already sent for a lower layer. In that case, don't send |
1700 | * we already sent for a lower layer. In that case, don't send |
1726 | * this one. |
1701 | * this one. |
1727 | */ |
1702 | */ |
1728 | if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1703 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1729 | { |
|
|
1730 | face_num = 0; |
1704 | face_num = 0; |
1731 | } |
|
|
1732 | |
1705 | |
1733 | /* We've gotten what face we want to use for the object. Now see if |
1706 | /* We've gotten what face we want to use for the object. Now see if |
1734 | * if it has changed since we last sent it to the client. |
1707 | * if it has changed since we last sent it to the client. |
1735 | */ |
1708 | */ |
1736 | if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) |
1709 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1737 | { |
1710 | { |
1738 | ns->lastmap.cells[sx][sy].faces[layer] = face_num; |
1711 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1739 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1712 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1740 | esrv_send_face (ns, face_num, 0); |
1713 | esrv_send_face (&ns, face_num, 0); |
1741 | SockList_AddShort (sl, face_num); |
1714 | |
|
|
1715 | sl << uint16 (face_num); |
1742 | return 1; |
1716 | return 1; |
1743 | } |
1717 | } |
|
|
1718 | |
1744 | /* Nothing changed */ |
1719 | /* Nothing changed */ |
1745 | return 0; |
1720 | return 0; |
1746 | } |
1721 | } |
1747 | |
1722 | |
1748 | /** |
1723 | /** |
… | |
… | |
1763 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1738 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1764 | * take. |
1739 | * take. |
1765 | */ |
1740 | */ |
1766 | |
1741 | |
1767 | static inline int |
1742 | static inline int |
1768 | update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1743 | update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1769 | { |
1744 | { |
1770 | object *ob; |
1745 | object *ob; |
1771 | int smoothlevel; /* old face_num; */ |
1746 | int smoothlevel; /* old face_num; */ |
1772 | |
1747 | |
1773 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1748 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1778 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1753 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1779 | smoothlevel = 0; |
1754 | smoothlevel = 0; |
1780 | else |
1755 | else |
1781 | { |
1756 | { |
1782 | smoothlevel = ob->smoothlevel; |
1757 | smoothlevel = ob->smoothlevel; |
1783 | if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1758 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1784 | SendSmooth (ns, ob->face->number); |
1759 | SendSmooth (&ns, ob->face->number); |
1785 | } /* else not already head object or blank face */ |
1760 | } /* else not already head object or blank face */ |
1786 | |
1761 | |
1787 | /* We've gotten what face we want to use for the object. Now see if |
1762 | /* We've gotten what face we want to use for the object. Now see if |
1788 | * if it has changed since we last sent it to the client. |
1763 | * if it has changed since we last sent it to the client. |
1789 | */ |
1764 | */ |
1790 | if (smoothlevel > 255) |
1765 | if (smoothlevel > 255) |
1791 | smoothlevel = 255; |
1766 | smoothlevel = 255; |
1792 | else if (smoothlevel < 0) |
1767 | else if (smoothlevel < 0) |
1793 | smoothlevel = 0; |
1768 | smoothlevel = 0; |
|
|
1769 | |
1794 | if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1770 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1795 | { |
1771 | { |
1796 | ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1772 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1797 | SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); |
1773 | sl << uint8 (smoothlevel); |
1798 | return 1; |
1774 | return 1; |
1799 | } |
1775 | } |
|
|
1776 | |
1800 | /* Nothing changed */ |
1777 | /* Nothing changed */ |
1801 | return 0; |
1778 | return 0; |
1802 | } |
1779 | } |
1803 | |
1780 | |
1804 | /** |
1781 | /** |
… | |
… | |
1845 | draw_client_map1 (object *pl) |
1822 | draw_client_map1 (object *pl) |
1846 | { |
1823 | { |
1847 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1824 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1848 | sint16 nx, ny; |
1825 | sint16 nx, ny; |
1849 | int estartlen, eoldlen; |
1826 | int estartlen, eoldlen; |
1850 | SockList sl; |
|
|
1851 | SockList esl; /*For extended Map info */ |
|
|
1852 | uint16 mask, emask; |
1827 | uint16 mask, emask; |
1853 | uint8 eentrysize; |
1828 | uint8 eentrysize; |
1854 | uint16 ewhatstart, ewhatflag; |
1829 | uint16 ewhatstart, ewhatflag; |
1855 | uint8 extendedinfos; |
1830 | uint8 extendedinfos; |
1856 | maptile *m; |
1831 | maptile *m; |
1857 | |
1832 | |
1858 | NewSocket & socket = pl->contr->socket; |
1833 | NewSocket &socket = pl->contr->socket; |
1859 | |
1834 | |
1860 | check_map_change (pl->contr); |
1835 | check_map_change (pl->contr); |
1861 | |
1836 | |
1862 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1837 | SockList sl (MAXSOCKBUF); |
1863 | if (socket.mapmode == Map1Cmd) |
1838 | SockList esl (MAXSOCKBUF); |
1864 | strcpy ((char *) sl.buf, "map1 "); |
1839 | |
1865 | else |
1840 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1866 | strcpy ((char *) sl.buf, "map1a "); |
|
|
1867 | sl.len = strlen ((char *) sl.buf); |
|
|
1868 | startlen = sl.len; |
1841 | startlen = sl.len; |
1869 | |
1842 | |
1870 | /*Extendedmapinfo structure initialisation */ |
1843 | /*Extendedmapinfo structure initialisation */ |
1871 | if (socket.ext_mapinfos) |
1844 | if (socket.ext_mapinfos) |
1872 | { |
1845 | { |
1873 | esl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1874 | strcpy ((char *) esl.buf, "mapextended "); |
|
|
1875 | esl.len = strlen ((char *) esl.buf); |
|
|
1876 | extendedinfos = EMI_NOREDRAW; |
1846 | extendedinfos = EMI_NOREDRAW; |
1877 | |
1847 | |
1878 | if (socket.EMI_smooth) |
1848 | if (socket.EMI_smooth) |
1879 | extendedinfos |= EMI_SMOOTH; |
1849 | extendedinfos |= EMI_SMOOTH; |
1880 | |
1850 | |
1881 | ewhatstart = esl.len; |
1851 | ewhatstart = esl.len; |
1882 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1852 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1883 | could need to be taken away */ |
1853 | could need to be taken away */ |
1884 | SockList_AddChar (&esl, extendedinfos); |
|
|
1885 | eentrysize = getExtendedMapInfoSize (&socket); |
1854 | eentrysize = getExtendedMapInfoSize (&socket); |
1886 | SockList_AddChar (&esl, eentrysize); |
1855 | esl << "mapextended " |
|
|
1856 | << uint8 (extendedinfos) |
|
|
1857 | << uint8 (eentrysize); |
1887 | estartlen = esl.len; |
1858 | estartlen = esl.len; |
1888 | } |
1859 | } |
1889 | else |
1860 | else |
1890 | { |
1861 | { |
1891 | /* suppress compiler warnings */ |
1862 | /* suppress compiler warnings */ |
… | |
… | |
1932 | { |
1903 | { |
1933 | int i, got_one; |
1904 | int i, got_one; |
1934 | |
1905 | |
1935 | oldlen = sl.len; |
1906 | oldlen = sl.len; |
1936 | |
1907 | |
1937 | SockList_AddShort (&sl, mask); |
1908 | sl << uint16 (mask); |
1938 | |
1909 | |
1939 | if (check_head (sl, socket, ax, ay, 2)) |
1910 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1940 | mask |= 0x4; |
|
|
1941 | if (check_head (sl, socket, ax, ay, 1)) |
1911 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1942 | mask |= 0x2; |
|
|
1943 | if (check_head (sl, socket, ax, ay, 0)) |
1912 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
1944 | mask |= 0x1; |
|
|
1945 | |
1913 | |
1946 | /* If all we are doing is sending 0 (blank) faces, we don't |
1914 | /* If all we are doing is sending 0 (blank) faces, we don't |
1947 | * actually need to send that - just the coordinates |
1915 | * actually need to send that - just the coordinates |
1948 | * with no faces tells the client to blank out the |
1916 | * with no faces tells the client to blank out the |
1949 | * space. |
1917 | * space. |
… | |
… | |
1986 | * if this hasn't already been done. If the space is out |
1954 | * if this hasn't already been done. If the space is out |
1987 | * of the map, it shouldn't have a head |
1955 | * of the map, it shouldn't have a head |
1988 | */ |
1956 | */ |
1989 | if (lastcell.count != -1) |
1957 | if (lastcell.count != -1) |
1990 | { |
1958 | { |
1991 | SockList_AddShort (&sl, mask); |
1959 | sl << uint16 (mask); |
1992 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1960 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1993 | } |
1961 | } |
1994 | } |
1962 | } |
1995 | else if (d > 3) |
1963 | else if (d > 3) |
1996 | { |
1964 | { |
… | |
… | |
2000 | * reason. Still may need to send the head for this space. |
1968 | * reason. Still may need to send the head for this space. |
2001 | */ |
1969 | */ |
2002 | |
1970 | |
2003 | oldlen = sl.len; |
1971 | oldlen = sl.len; |
2004 | |
1972 | |
2005 | SockList_AddShort (&sl, mask); |
1973 | sl << uint16 (mask); |
2006 | |
1974 | |
2007 | if (lastcell.count != -1) |
1975 | if (lastcell.count != -1) |
2008 | need_send = 1; |
1976 | need_send = 1; |
2009 | |
1977 | |
2010 | count = -1; |
1978 | count = -1; |
2011 | |
1979 | |
2012 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
1980 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
2013 | { |
1981 | { |
2014 | /* Now check to see if any heads need to be sent */ |
1982 | /* Now check to see if any heads need to be sent */ |
2015 | |
1983 | |
2016 | if (check_head (sl, socket, ax, ay, 2)) |
1984 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
2017 | mask |= 0x4; |
|
|
2018 | if (check_head (sl, socket, ax, ay, 1)) |
1985 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
2019 | mask |= 0x2; |
|
|
2020 | if (check_head (sl, socket, ax, ay, 0)) |
1986 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
2021 | mask |= 0x1; |
|
|
2022 | |
1987 | |
2023 | lastcell.count = count; |
1988 | lastcell.count = count; |
2024 | } |
1989 | } |
2025 | else |
1990 | else |
2026 | { |
1991 | { |
… | |
… | |
2055 | */ |
2020 | */ |
2056 | oldlen = sl.len; |
2021 | oldlen = sl.len; |
2057 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2022 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2058 | eoldlen = esl.len; |
2023 | eoldlen = esl.len; |
2059 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2024 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2060 | SockList_AddShort (&sl, mask); |
2025 | sl << uint16 (mask); |
2061 | |
2026 | |
2062 | if (socket.ext_mapinfos) |
2027 | if (socket.ext_mapinfos) |
2063 | SockList_AddShort (&esl, emask); |
2028 | esl << uint16 (emask); |
2064 | |
2029 | |
2065 | unsigned char dummy; |
2030 | unsigned char dummy; |
2066 | unsigned char *last_ext = &dummy; |
2031 | unsigned char *last_ext = &dummy; |
2067 | |
2032 | |
2068 | /* Darkness changed */ |
2033 | /* Darkness changed */ |
… | |
… | |
2072 | |
2037 | |
2073 | if (socket.extmap) |
2038 | if (socket.extmap) |
2074 | { |
2039 | { |
2075 | *last_ext |= 0x80; |
2040 | *last_ext |= 0x80; |
2076 | last_ext = sl.buf + sl.len; |
2041 | last_ext = sl.buf + sl.len; |
2077 | SockList_AddChar (&sl, d); |
2042 | sl << uint8 (d); |
2078 | } |
2043 | } |
2079 | else |
2044 | else |
2080 | SockList_AddChar (&sl, 255 - 64 * d); |
2045 | sl << uint8 (255 - 64 * d); |
2081 | } |
2046 | } |
2082 | |
2047 | |
2083 | lastcell.count = d; |
2048 | lastcell.count = d; |
2084 | |
2049 | |
2085 | if (socket.extmap) |
2050 | if (socket.extmap) |
… | |
… | |
2152 | sl << uint8 (8) << uint8 (flags); |
2117 | sl << uint8 (8) << uint8 (flags); |
2153 | } |
2118 | } |
2154 | } |
2119 | } |
2155 | |
2120 | |
2156 | /* Floor face */ |
2121 | /* Floor face */ |
2157 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) |
2122 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
2158 | mask |= 0x4; |
2123 | mask |= 0x4; |
2159 | |
2124 | |
2160 | if (socket.EMI_smooth) |
2125 | if (socket.EMI_smooth) |
2161 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) |
2126 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
2162 | emask |= 0x4; |
2127 | emask |= 0x4; |
2163 | |
2128 | |
2164 | /* Middle face */ |
2129 | /* Middle face */ |
2165 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) |
2130 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
2166 | mask |= 0x2; |
2131 | mask |= 0x2; |
2167 | |
2132 | |
2168 | if (socket.EMI_smooth) |
2133 | if (socket.EMI_smooth) |
2169 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) |
2134 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
2170 | emask |= 0x2; |
2135 | emask |= 0x2; |
2171 | |
2136 | |
2172 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2137 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2173 | { |
2138 | { |
2174 | if (lastcell.faces[0] != pl->face->number) |
2139 | if (lastcell.faces[0] != pl->face->number) |
… | |
… | |
2183 | } |
2148 | } |
2184 | } |
2149 | } |
2185 | else |
2150 | else |
2186 | { |
2151 | { |
2187 | /* Top face */ |
2152 | /* Top face */ |
2188 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) |
2153 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
2189 | mask |= 0x1; |
2154 | mask |= 0x1; |
2190 | |
2155 | |
2191 | if (socket.EMI_smooth) |
2156 | if (socket.EMI_smooth) |
2192 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) |
2157 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
2193 | emask |= 0x1; |
2158 | emask |= 0x1; |
2194 | } |
2159 | } |
2195 | |
2160 | |
2196 | /* Check to see if we are in fact sending anything for this |
2161 | /* Check to see if we are in fact sending anything for this |
2197 | * space by checking the mask. If so, update the mask. |
2162 | * space by checking the mask. If so, update the mask. |
… | |
… | |
2223 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2188 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2224 | } |
2189 | } |
2225 | |
2190 | |
2226 | if (esl.len > estartlen) |
2191 | if (esl.len > estartlen) |
2227 | Send_With_Handling (&socket, &esl); |
2192 | Send_With_Handling (&socket, &esl); |
2228 | |
|
|
2229 | free (esl.buf); |
|
|
2230 | } |
2193 | } |
2231 | |
2194 | |
2232 | if (sl.len > startlen || socket.sent_scroll) |
2195 | if (sl.len > startlen || socket.sent_scroll) |
2233 | { |
2196 | { |
2234 | Send_With_Handling (&socket, &sl); |
2197 | Send_With_Handling (&socket, &sl); |
2235 | socket.sent_scroll = 0; |
2198 | socket.sent_scroll = 0; |
2236 | } |
2199 | } |
2237 | |
2200 | |
2238 | free (sl.buf); |
2201 | sl.free (); |
|
|
2202 | esl.free (); |
2239 | } |
2203 | } |
2240 | |
2204 | |
2241 | /** |
2205 | /** |
2242 | * Draws client map. |
2206 | * Draws client map. |
2243 | */ |
2207 | */ |
… | |
… | |
2357 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2321 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
2358 | } |
2322 | } |
2359 | } /* Is a valid space */ |
2323 | } /* Is a valid space */ |
2360 | } |
2324 | } |
2361 | } |
2325 | } |
|
|
2326 | |
2362 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2327 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
2363 | |
2328 | |
2364 | check_map_change (pl->contr); |
2329 | check_map_change (pl->contr); |
2365 | } |
2330 | } |
2366 | |
2331 | |
… | |
… | |
2383 | /** |
2348 | /** |
2384 | * This sends the skill number to name mapping. We ignore |
2349 | * This sends the skill number to name mapping. We ignore |
2385 | * the params - we always send the same info no matter what. |
2350 | * the params - we always send the same info no matter what. |
2386 | */ |
2351 | */ |
2387 | void |
2352 | void |
2388 | send_skill_info (NewSocket * ns, char *params) |
2353 | send_skill_info (NewSocket *ns, char *params) |
2389 | { |
2354 | { |
2390 | SockList sl; |
2355 | SockList sl (MAXSOCKBUF); |
2391 | int i; |
2356 | sl << "replyinfo skill_info\n"; |
2392 | |
2357 | |
2393 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2394 | strcpy ((char *) sl.buf, "replyinfo skill_info\n"); |
|
|
2395 | for (i = 1; i < NUM_SKILLS; i++) |
2358 | for (int i = 1; i < NUM_SKILLS; i++) |
2396 | { |
|
|
2397 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2359 | sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2398 | } |
2360 | |
2399 | sl.len = strlen ((char *) sl.buf); |
|
|
2400 | if (sl.len >= MAXSOCKBUF) |
2361 | if (sl.len >= MAXSOCKBUF) |
2401 | { |
2362 | { |
2402 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2363 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2403 | fatal (0); |
2364 | fatal (0); |
2404 | } |
2365 | } |
|
|
2366 | |
2405 | Send_With_Handling (ns, &sl); |
2367 | Send_With_Handling (ns, &sl); |
2406 | free (sl.buf); |
2368 | sl.free (); |
2407 | } |
2369 | } |
2408 | |
2370 | |
2409 | /** |
2371 | /** |
2410 | * This sends the spell path to name mapping. We ignore |
2372 | * This sends the spell path to name mapping. We ignore |
2411 | * the params - we always send the same info no matter what. |
2373 | * the params - we always send the same info no matter what. |
2412 | */ |
2374 | */ |
2413 | void |
2375 | void |
2414 | send_spell_paths (NewSocket * ns, char *params) |
2376 | send_spell_paths (NewSocket * ns, char *params) |
2415 | { |
2377 | { |
2416 | SockList sl; |
2378 | SockList sl (MAXSOCKBUF); |
2417 | int i; |
|
|
2418 | |
2379 | |
2419 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2380 | sl << "replyinfo spell_paths\n"; |
2420 | strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); |
2381 | |
2421 | for (i = 0; i < NRSPELLPATHS; i++) |
2382 | for (int i = 0; i < NRSPELLPATHS; i++) |
2422 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); |
2383 | sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", 1 << i, spellpathnames[i]); |
2423 | sl.len = strlen ((char *) sl.buf); |
2384 | |
2424 | if (sl.len >= MAXSOCKBUF) |
2385 | if (sl.len >= MAXSOCKBUF) |
2425 | { |
2386 | { |
2426 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2387 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2427 | fatal (0); |
2388 | fatal (0); |
2428 | } |
2389 | } |
|
|
2390 | |
2429 | Send_With_Handling (ns, &sl); |
2391 | Send_With_Handling (ns, &sl); |
2430 | free (sl.buf); |
2392 | sl.free (); |
2431 | } |
2393 | } |
2432 | |
2394 | |
2433 | /** |
2395 | /** |
2434 | * This looks for any spells the player may have that have changed their stats. |
2396 | * 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 |
2397 | * it then sends an updspell packet for each spell that has changed in this way |
2436 | */ |
2398 | */ |
2437 | void |
2399 | void |
2438 | esrv_update_spells (player *pl) |
2400 | esrv_update_spells (player *pl) |
2439 | { |
2401 | { |
2440 | SockList sl; |
|
|
2441 | int flags = 0; |
|
|
2442 | object *spell; |
|
|
2443 | |
|
|
2444 | if (!pl->socket.monitor_spells) |
2402 | if (!pl->socket.monitor_spells) |
2445 | return; |
2403 | return; |
|
|
2404 | |
2446 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2405 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2447 | { |
2406 | { |
2448 | if (spell->type == SPELL) |
2407 | if (spell->type == SPELL) |
2449 | { |
2408 | { |
|
|
2409 | int flags = 0; |
|
|
2410 | |
2450 | /* check if we need to update it */ |
2411 | /* check if we need to update it */ |
2451 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2412 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2452 | { |
2413 | { |
2453 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2414 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2454 | flags |= UPD_SP_MANA; |
2415 | flags |= UPD_SP_MANA; |
2455 | } |
2416 | } |
|
|
2417 | |
2456 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2418 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2457 | { |
2419 | { |
2458 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2420 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2459 | flags |= UPD_SP_GRACE; |
2421 | flags |= UPD_SP_GRACE; |
2460 | } |
2422 | } |
|
|
2423 | |
2461 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2424 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2462 | { |
2425 | { |
2463 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2426 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2464 | flags |= UPD_SP_DAMAGE; |
2427 | flags |= UPD_SP_DAMAGE; |
2465 | } |
2428 | } |
|
|
2429 | |
2466 | if (flags != 0) |
2430 | if (flags) |
2467 | { |
2431 | { |
2468 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2432 | SockList sl (MAXSOCKBUF); |
2469 | strcpy ((char *) sl.buf, "updspell "); |
|
|
2470 | sl.len = strlen ((char *) sl.buf); |
|
|
2471 | |
2433 | |
|
|
2434 | sl << "updspell " |
|
|
2435 | << uint8 (flags) |
2472 | sl << uint8 (flags) << uint32 (spell->count); |
2436 | << uint32 (spell->count); |
2473 | |
2437 | |
2474 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2438 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2475 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2439 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2476 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2440 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2477 | |
2441 | |
2478 | flags = 0; |
|
|
2479 | Send_With_Handling (&pl->socket, &sl); |
2442 | Send_With_Handling (&pl->socket, &sl); |
2480 | free (sl.buf); |
2443 | sl.free (); |
2481 | } |
2444 | } |
2482 | } |
2445 | } |
2483 | } |
2446 | } |
2484 | } |
2447 | } |
2485 | |
2448 | |
2486 | void |
2449 | void |
2487 | esrv_remove_spell (player *pl, object *spell) |
2450 | esrv_remove_spell (player *pl, object *spell) |
2488 | { |
2451 | { |
2489 | SockList sl; |
|
|
2490 | |
|
|
2491 | if (!pl->socket.monitor_spells) |
2452 | if (!pl->socket.monitor_spells) |
2492 | return; |
2453 | return; |
|
|
2454 | |
2493 | if (!pl || !spell || spell->env != pl->ob) |
2455 | if (!pl || !spell || spell->env != pl->ob) |
2494 | { |
2456 | { |
2495 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2457 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2496 | return; |
2458 | return; |
2497 | } |
2459 | } |
2498 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2499 | strcpy ((char *) sl.buf, "delspell "); |
|
|
2500 | sl.len = strlen ((char *) sl.buf); |
|
|
2501 | |
2460 | |
|
|
2461 | SockList sl (MAXSOCKBUF); |
|
|
2462 | |
|
|
2463 | sl << "delspell " |
2502 | sl << uint32 (spell->count); |
2464 | << uint32 (spell->count); |
2503 | |
2465 | |
2504 | Send_With_Handling (&pl->socket, &sl); |
2466 | Send_With_Handling (&pl->socket, &sl); |
2505 | free (sl.buf); |
2467 | sl.free (); |
2506 | } |
2468 | } |
2507 | |
2469 | |
2508 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2470 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2509 | static void |
2471 | static void |
2510 | append_spell (player *pl, SockList &sl, object *spell) |
2472 | append_spell (player *pl, SockList &sl, object *spell) |
… | |
… | |
2552 | * all spells in the player's inventory. |
2514 | * all spells in the player's inventory. |
2553 | */ |
2515 | */ |
2554 | void |
2516 | void |
2555 | esrv_add_spells (player *pl, object *spell) |
2517 | esrv_add_spells (player *pl, object *spell) |
2556 | { |
2518 | { |
2557 | SockList sl; |
|
|
2558 | |
|
|
2559 | if (!pl) |
2519 | if (!pl) |
2560 | { |
2520 | { |
2561 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2521 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2562 | return; |
2522 | return; |
2563 | } |
2523 | } |
|
|
2524 | |
2564 | if (!pl->socket.monitor_spells) |
2525 | if (!pl->socket.monitor_spells) |
2565 | return; |
2526 | return; |
2566 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2527 | |
2567 | strcpy ((char *) sl.buf, "addspell "); |
2528 | SockList sl (MAXSOCKBUF); |
2568 | sl.len = strlen ((char *) sl.buf); |
2529 | |
|
|
2530 | sl << "addspell "; |
|
|
2531 | |
2569 | if (!spell) |
2532 | if (!spell) |
2570 | { |
2533 | { |
2571 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2534 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2572 | { |
2535 | { |
2573 | /* were we to simply keep appending data here, we could exceed |
2536 | /* were we to simply keep appending data here, we could exceed |
… | |
… | |
2602 | return; |
2565 | return; |
2603 | } |
2566 | } |
2604 | else |
2567 | else |
2605 | append_spell (pl, sl, spell); |
2568 | append_spell (pl, sl, spell); |
2606 | |
2569 | |
2607 | if (sl.len >= MAXSOCKBUF) |
2570 | if (sl.length () >= MAXSOCKBUF) |
2608 | { |
2571 | { |
2609 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2572 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2610 | fatal (0); |
2573 | fatal (0); |
2611 | } |
2574 | } |
2612 | |
2575 | |
2613 | /* finally, we can send the packet */ |
2576 | /* finally, we can send the packet */ |
2614 | Send_With_Handling (&pl->socket, &sl); |
2577 | Send_With_Handling (&pl->socket, &sl); |
2615 | free (sl.buf); |
2578 | |
|
|
2579 | sl.free (); |
2616 | } |
2580 | } |
|
|
2581 | |