Merge branch 'master' into server

37ebc91f · nanahira · f5974af8 · e17b1a56 · 37ebc91f · 37ebc91f
Commit 37ebc91f authored Sep 23, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

cards.cdb cards.cdb +0 -0

gframe/gframe.cpp gframe/gframe.cpp +9 -5

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/gframe.cpp
+++ b/gframe/gframe.cpp
@@ -37,11 +37,15 @@ int main(int argc, char* argv[]) {
 #endif //__APPLE__
 #ifdef _WIN32
 #ifndef _DEBUG
-	wchar_t exepath[MAX_PATH];
+	char* pstrext;
-	GetModuleFileNameW(NULL, exepath, MAX_PATH);
+	if(argc == 2 && (pstrext = strrchr(argv[1], '.'))
-	wchar_t* p = wcsrchr(exepath, '\\');
+		&& (!mystrncasecmp(pstrext, ".ydk", 4) || !mystrncasecmp(pstrext, ".yrp", 4))) {
-	*p = '\0';
+		wchar_t exepath[MAX_PATH];
-	SetCurrentDirectoryW(exepath);
+		GetModuleFileNameW(NULL, exepath, MAX_PATH);
+		wchar_t* p = wcsrchr(exepath, '\\');
+		*p = '\0';
+		SetCurrentDirectoryW(exepath);
+	}
 #endif //_DEBUG
 #endif //_WIN32
 #ifdef _WIN32

--- a/script @ 47adef36
+++ b/script @ 47adef36
-Subproject commit 7fd19f2dee87668f6d53c7b95080cf92fdecce58
+Subproject commit 47adef367f7160dfbee07c236c2ce9a051733ff4