Commit 1a208e9f authored by fallenstardust's avatar fallenstardust

fix

parent 8951664b
...@@ -1301,18 +1301,6 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) { ...@@ -1301,18 +1301,6 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
} }
void Game::RefreshReplay() { void Game::RefreshReplay() {
lstReplayList->clear(); lstReplayList->clear();
#ifdef _WIN32
WIN32_FIND_DATAW fdataw;
HANDLE fh = FindFirstFileW(L"./replay/*.yrp", &fdataw);
if(fh == INVALID_HANDLE_VALUE)
return;
do {
if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && Replay::CheckReplay(fdataw.cFileName)) {
lstReplayList->addItem(fdataw.cFileName);
}
} while(FindNextFileW(fh, &fdataw));
FindClose(fh);
#else
DIR * dir; DIR * dir;
struct dirent * dirp; struct dirent * dirp;
if((dir = opendir("./replay/")) == NULL) if((dir = opendir("./replay/")) == NULL)
...@@ -1327,21 +1315,10 @@ void Game::RefreshReplay() { ...@@ -1327,21 +1315,10 @@ void Game::RefreshReplay() {
lstReplayList->addItem(wname); lstReplayList->addItem(wname);
} }
closedir(dir); closedir(dir);
#endif
} }
void Game::RefreshSingleplay() { void Game::RefreshSingleplay() {
lstSinglePlayList->clear(); lstSinglePlayList->clear();
#ifdef _WIN32 stSinglePlayInfo->setText(L"");
WIN32_FIND_DATAW fdataw;
HANDLE fh = FindFirstFileW(L"./single/*.lua", &fdataw);
if(fh == INVALID_HANDLE_VALUE)
return;
do {
if(!(fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
lstSinglePlayList->addItem(fdataw.cFileName);
} while(FindNextFileW(fh, &fdataw));
FindClose(fh);
#else
DIR * dir; DIR * dir;
struct dirent * dirp; struct dirent * dirp;
if((dir = opendir("./single/")) == NULL) if((dir = opendir("./single/")) == NULL)
...@@ -1355,7 +1332,6 @@ void Game::RefreshSingleplay() { ...@@ -1355,7 +1332,6 @@ void Game::RefreshSingleplay() {
lstSinglePlayList->addItem(wname); lstSinglePlayList->addItem(wname);
} }
closedir(dir); closedir(dir);
#endif
} }
void Game::RefreshBot() { void Game::RefreshBot() {
if(!gameConf.enable_bot_mode) if(!gameConf.enable_bot_mode)
......
...@@ -4560,7 +4560,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe ...@@ -4560,7 +4560,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe
target->current.reason_player = target->temp.reason_player; target->current.reason_player = target->temp.reason_player;
if(is_destroy) if(is_destroy)
core.destroy_canceled.insert(target); core.destroy_canceled.insert(target);
replace_effect->dec_count(); replace_effect->dec_count(replace_effect->get_handler_player());
} else } else
core.units.begin()->step = 2; core.units.begin()->step = 2;
return FALSE; return FALSE;
...@@ -4627,7 +4627,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe ...@@ -4627,7 +4627,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe
targets->container.erase(rm); targets->container.erase(rm);
} }
} }
replace_effect->dec_count(); replace_effect->dec_count(replace_effect->get_handler_player());
} else } else
core.units.begin()->step = 7; core.units.begin()->step = 7;
return FALSE; return FALSE;
...@@ -4689,7 +4689,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe ...@@ -4689,7 +4689,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe
target->current.reason_player = target->temp.reason_player; target->current.reason_player = target->temp.reason_player;
if(is_destroy) if(is_destroy)
core.destroy_canceled.insert(target); core.destroy_canceled.insert(target);
replace_effect->dec_count(); replace_effect->dec_count(replace_effect->get_handler_player());
core.desrep_chain.push_back(core.continuous_chain.front()); core.desrep_chain.push_back(core.continuous_chain.front());
} }
core.continuous_chain.pop_front(); core.continuous_chain.pop_front();
...@@ -4738,7 +4738,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe ...@@ -4738,7 +4738,7 @@ int32 field::operation_replace(uint16 step, effect* replace_effect, group* targe
targets->container.erase(rm); targets->container.erase(rm);
} }
} }
replace_effect->dec_count(); replace_effect->dec_count(replace_effect->get_handler_player());
core.desrep_chain.push_back(core.continuous_chain.front()); core.desrep_chain.push_back(core.continuous_chain.front());
} }
core.continuous_chain.pop_front(); core.continuous_chain.pop_front();
......
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 331001215 versionCode 331001221
versionName "3.3.10" versionName "3.3.10"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
......
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