Merge branch 'master' into jgrpp

Remove 'byte' typedef
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
--- a/src/sl/company_sl.cpp
+++ b/src/sl/company_sl.cpp
@@ -653,7 +653,7 @@ static void Save_PLYP()
 		return;
 	}

-	std::vector<byte> buffer = SlSaveToVector([]() {
+	std::vector<uint8_t> buffer = SlSaveToVector([]() {
 		SlWriteUint32((uint32_t)_network_company_server_id.size());
 		MemoryDumper::GetCurrent()->CopyBytes((const uint8_t *)_network_company_server_id.data(), _network_company_server_id.size());