Commit 584831b9 authored by nanahira's avatar nanahira

Merge branch 'server_mc' into server

parents ebf4329a 1ab86ff5
...@@ -224,10 +224,10 @@ const wchar_t* DataManager::GetText(int code) { ...@@ -224,10 +224,10 @@ const wchar_t* DataManager::GetText(int code) {
return unknown_string; return unknown_string;
} }
const wchar_t* DataManager::GetDesc(int strCode) { const wchar_t* DataManager::GetDesc(int strCode) {
if(strCode < 10000) if((unsigned int)strCode < 10000u)
return GetSysString(strCode); return GetSysString(strCode);
int code = strCode >> 4; unsigned int code = strCode >> 4;
int offset = strCode & 0xf; unsigned int offset = strCode & 0xf;
auto csit = _strings.find(code); auto csit = _strings.find(code);
if(csit == _strings.end()) if(csit == _strings.end())
return unknown_string; return unknown_string;
......
...@@ -71,10 +71,12 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -71,10 +71,12 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
is_recorder = true; is_recorder = true;
cache_recorder = dp; cache_recorder = dp;
} }
#ifndef YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
if(!wcscmp(jpass, L"Marshtomp") && !replay_recorder) { if(!wcscmp(jpass, L"Marshtomp") && !replay_recorder) {
is_recorder = true; is_recorder = true;
replay_recorder = dp; replay_recorder = dp;
} }
#endif //YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
#else #else
if(wcscmp(jpass, pass)) { if(wcscmp(jpass, pass)) {
STOC_ErrorMsg scem; STOC_ErrorMsg scem;
......
...@@ -67,10 +67,12 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -67,10 +67,12 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
is_recorder = true; is_recorder = true;
cache_recorder = dp; cache_recorder = dp;
} }
#ifndef YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
if(!wcscmp(jpass, L"Marshtomp") && !replay_recorder) { if(!wcscmp(jpass, L"Marshtomp") && !replay_recorder) {
is_recorder = true; is_recorder = true;
replay_recorder = dp; replay_recorder = dp;
} }
#endif //YGOPRO_SERVER_MODE_DISABLE_CLOUD_REPLAY
#else #else
if(wcscmp(jpass, pass)) { if(wcscmp(jpass, pass)) {
STOC_ErrorMsg scem; STOC_ErrorMsg scem;
......
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