Skip to content

Y
ygopro-2pick
Commit 0b075f6a authored by nanahira's avatar nanahira
Browse files
Options

ref

parent 7bb284cc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
gframe/duelclient.cpp
View file @ 0b075f6a
...@@ -987,11 +987,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len, bool retry) { ...@@ -987,11 +987,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len, bool retry) {
mainGame->dInfo.time_player = 2; mainGame->dInfo.time_player = 2;
switch(mainGame->dInfo.curMsg) { switch(mainGame->dInfo.curMsg) {
case MSG_RETRY: { case MSG_RETRY: {
<<<<<<< HEAD
if(!retry && last_successful_msg_length) {
mainGame->gMutex.Lock();
mainGame->stMessage->setText(dataManager.GetDesc(1422));
=======
if(last_successful_msg_length) { if(last_successful_msg_length) {
char* p = last_successful_msg; char* p = last_successful_msg;
auto last_msg = BufferIO::ReadUInt8(p); auto last_msg = BufferIO::ReadUInt8(p);
...@@ -1006,7 +1001,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len, bool retry) { ...@@ -1006,7 +1001,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len, bool retry) {
} }
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->stMessage->setText(dataManager.GetDesc(err_desc)); mainGame->stMessage->setText(dataManager.GetDesc(err_desc));
>>>>>>> retry_fh
mainGame->PopupElement(mainGame->wMessage); mainGame->PopupElement(mainGame->wMessage);
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
mainGame->actionSignal.Reset(); mainGame->actionSignal.Reset();
......
ocgcore @ cfbe5a15
Subproject commit 9f7a67a34b0a345df2b98fd550765afb565c9107 Subproject commit cfbe5a15215c7168d962f540ed63d02d5ab804e1
script @ a5a534da
Subproject commit 4ee3551e3be02d6527a62b2d473b9c3740516963 Subproject commit a5a534da7c7fed9fe8bc67e7f533be7eb2db5ded
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