Commit b22ff21a authored by Chen Bill's avatar Chen Bill

use macro _WIN32

parent 51929625
...@@ -269,7 +269,7 @@ FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) { ...@@ -269,7 +269,7 @@ FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
return fp; return fp;
} }
IReadFile* DeckManager::OpenDeckReader(const wchar_t* file) { IReadFile* DeckManager::OpenDeckReader(const wchar_t* file) {
#ifdef WIN32 #ifdef _WIN32
IReadFile* reader = dataManager.FileSystem->createAndOpenFile(file); IReadFile* reader = dataManager.FileSystem->createAndOpenFile(file);
#else #else
char file2[256]; char file2[256];
...@@ -333,7 +333,7 @@ bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) { ...@@ -333,7 +333,7 @@ bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
return true; return true;
} }
bool DeckManager::DeleteDeck(const wchar_t* file) { bool DeckManager::DeleteDeck(const wchar_t* file) {
#ifdef WIN32 #ifdef _WIN32
BOOL result = DeleteFileW(file); BOOL result = DeleteFileW(file);
return !!result; return !!result;
#else #else
......
...@@ -51,8 +51,8 @@ void DuelInfo::Clear() { ...@@ -51,8 +51,8 @@ void DuelInfo::Clear() {
} }
bool IsExtension(const wchar_t* filename, const wchar_t* extension) { bool IsExtension(const wchar_t* filename, const wchar_t* extension) {
int flen = std::wcslen(filename); auto flen = std::wcslen(filename);
int elen = std::wcslen(extension); auto elen = std::wcslen(extension);
if (!elen || flen < elen) if (!elen || flen < elen)
return false; return false;
return !mywcsncasecmp(filename + (flen - elen), extension, elen); return !mywcsncasecmp(filename + (flen - elen), extension, elen);
......
...@@ -129,7 +129,7 @@ int main(int argc, char* argv[]) { ...@@ -129,7 +129,7 @@ int main(int argc, char* argv[]) {
if(i < wargc) { if(i < wargc) {
open_file = true; open_file = true;
if(deckCategorySpecified) { if(deckCategorySpecified) {
#ifdef WIN32 #ifdef _WIN32
myswprintf(open_file_name, L"%ls\\%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]); myswprintf(open_file_name, L"%ls\\%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]);
#else #else
myswprintf(open_file_name, L"%ls/%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]); myswprintf(open_file_name, L"%ls/%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]);
......
...@@ -428,7 +428,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -428,7 +428,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case BUTTON_DECK_EDIT: { case BUTTON_DECK_EDIT: {
mainGame->RefreshCategoryDeck(mainGame->cbDBCategory, mainGame->cbDBDecks); mainGame->RefreshCategoryDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
if(open_file && deckManager.LoadCurrentDeck(open_file_name)) { if(open_file && deckManager.LoadCurrentDeck(open_file_name)) {
#ifdef WIN32 #ifdef _WIN32
wchar_t *dash = wcsrchr(open_file_name, L'\\'); wchar_t *dash = wcsrchr(open_file_name, L'\\');
#else #else
wchar_t *dash = wcsrchr(open_file_name, L'/'); wchar_t *dash = wcsrchr(open_file_name, L'/');
......
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