Commit c1cd59c4 authored by Chen Bill's avatar Chen Bill Committed by GitHub

change byte to unsigned char (#2622)

the dependency of byte is Windows SDK, not common.h
parent 48d53cda
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
namespace ygo { namespace ygo {
const wchar_t* DataManager::unknown_string = L"???"; const wchar_t* DataManager::unknown_string = L"???";
byte DataManager::scriptBuffer[0x20000]; unsigned char DataManager::scriptBuffer[0x20000];
IFileSystem* DataManager::FileSystem; IFileSystem* DataManager::FileSystem;
DataManager dataManager; DataManager dataManager;
...@@ -390,7 +390,7 @@ uint32 DataManager::CardReader(uint32 code, card_data* pData) { ...@@ -390,7 +390,7 @@ uint32 DataManager::CardReader(uint32 code, card_data* pData) {
pData->clear(); pData->clear();
return 0; return 0;
} }
byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) { unsigned char* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
// default script name: ./script/c%d.lua // default script name: ./script/c%d.lua
char first[256]{}; char first[256]{};
char second[256]{}; char second[256]{};
...@@ -406,7 +406,7 @@ byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) { ...@@ -406,7 +406,7 @@ byte* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
else else
return ScriptReader(second, slen); return ScriptReader(second, slen);
} }
byte* DataManager::ScriptReader(const char* script_name, int* slen) { unsigned char* DataManager::ScriptReader(const char* script_name, int* slen) {
#ifdef _WIN32 #ifdef _WIN32
wchar_t fname[256]{}; wchar_t fname[256]{};
BufferIO::DecodeUTF8(script_name, fname); BufferIO::DecodeUTF8(script_name, fname);
......
...@@ -50,11 +50,11 @@ public: ...@@ -50,11 +50,11 @@ public:
std::unordered_map<unsigned int, std::wstring> _sysStrings; std::unordered_map<unsigned int, std::wstring> _sysStrings;
char errmsg[512]{}; char errmsg[512]{};
static byte scriptBuffer[0x20000]; static unsigned char scriptBuffer[0x20000];
static const wchar_t* unknown_string; static const wchar_t* unknown_string;
static uint32 CardReader(uint32, card_data*); static uint32 CardReader(uint32, card_data*);
static byte* ScriptReaderEx(const char* script_name, int* slen); static unsigned char* ScriptReaderEx(const char* script_name, int* slen);
static byte* ScriptReader(const char* script_name, int* slen); static unsigned char* ScriptReader(const char* script_name, int* slen);
static IFileSystem* FileSystem; static IFileSystem* FileSystem;
private: private:
......
...@@ -886,7 +886,7 @@ inline void ReplayMode::ReloadLocation(int player, int location, int flag, std:: ...@@ -886,7 +886,7 @@ inline void ReplayMode::ReloadLocation(int player, int location, int flag, std::
mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(player), location, queryBuffer.data()); mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(player), location, queryBuffer.data());
} }
void ReplayMode::ReplayRefresh(int flag) { void ReplayMode::ReplayRefresh(int flag) {
std::vector<byte> queryBuffer; std::vector<unsigned char> queryBuffer;
queryBuffer.resize(SIZE_QUERY_BUFFER); queryBuffer.resize(SIZE_QUERY_BUFFER);
ReloadLocation(0, LOCATION_MZONE, flag, queryBuffer); ReloadLocation(0, LOCATION_MZONE, flag, queryBuffer);
ReloadLocation(1, LOCATION_MZONE, flag, queryBuffer); ReloadLocation(1, LOCATION_MZONE, flag, queryBuffer);
......
...@@ -1418,7 +1418,7 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1418,7 +1418,7 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
return 0; return 0;
} }
void SingleDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) { void SingleDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) {
byte resb[SIZE_RETURN_VALUE]{}; unsigned char resb[SIZE_RETURN_VALUE]{};
if (len > SIZE_RETURN_VALUE) if (len > SIZE_RETURN_VALUE)
len = SIZE_RETURN_VALUE; len = SIZE_RETURN_VALUE;
std::memcpy(resb, pdata, len); std::memcpy(resb, pdata, len);
......
...@@ -815,7 +815,7 @@ void SingleMode::SinglePlayRefreshSingle(int player, int location, int sequence, ...@@ -815,7 +815,7 @@ void SingleMode::SinglePlayRefreshSingle(int player, int location, int sequence,
mainGame->dField.UpdateCard(mainGame->LocalPlayer(player), location, sequence, queryBuffer); mainGame->dField.UpdateCard(mainGame->LocalPlayer(player), location, sequence, queryBuffer);
} }
void SingleMode::SinglePlayReload() { void SingleMode::SinglePlayReload() {
std::vector<byte> queryBuffer; std::vector<unsigned char> queryBuffer;
queryBuffer.resize(SIZE_QUERY_BUFFER); queryBuffer.resize(SIZE_QUERY_BUFFER);
unsigned int flag = 0xffdfff; unsigned int flag = 0xffdfff;
ReloadLocation(0, LOCATION_MZONE, flag, queryBuffer); ReloadLocation(0, LOCATION_MZONE, flag, queryBuffer);
......
...@@ -1533,7 +1533,7 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) { ...@@ -1533,7 +1533,7 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
return 0; return 0;
} }
void TagDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) { void TagDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) {
byte resb[SIZE_RETURN_VALUE]{}; unsigned char resb[SIZE_RETURN_VALUE]{};
if (len > SIZE_RETURN_VALUE) if (len > SIZE_RETURN_VALUE)
len = SIZE_RETURN_VALUE; len = SIZE_RETURN_VALUE;
std::memcpy(resb, pdata, len); std::memcpy(resb, pdata, len);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment