diff --git a/src/sdlmain.cpp b/src/sdlmain.cpp index 97b0dc0..42b20a2 100644 --- a/src/sdlmain.cpp +++ b/src/sdlmain.cpp @@ -2,13 +2,10 @@ #include "sys/nact.h" _TCHAR g_root[_MAX_PATH]; -HINSTANCE g_hinst; SDL_Window* g_window; int main(int argc, char *argv[]) { - g_hinst = (HINSTANCE)::GetModuleHandle(NULL); - SDL_Init(SDL_INIT_VIDEO); // ウィンドウ表示 diff --git a/src/sys/ags_cursor.cpp b/src/sys/ags_cursor.cpp index 967ca05..c816d0e 100644 --- a/src/sys/ags_cursor.cpp +++ b/src/sys/ags_cursor.cpp @@ -6,8 +6,6 @@ #include "ags.h" -extern HINSTANCE g_hinst; - void AGS::load_cursor(int page) { // ƒJ�[ƒ\ƒ‹CG‚ðƒ��[ƒh‚·‚é @@ -28,6 +26,8 @@ void AGS::load_cursor(int page) cg_dest_y = j_y; dest_screen = dest; + HINSTANCE hinst = (HINSTANCE)GetModuleHandle(NULL); + // ƒtƒHƒ“ƒg‚Ì�¶�¬ for(int i = 0; i < 10; i++) { // ƒpƒ^�[ƒ““Ç‚Ý�ž‚Ý @@ -78,7 +78,7 @@ void AGS::load_cursor(int page) if(hCursor[i]) { DestroyCursor(hCursor[i]); } - hCursor[i] = CreateCursor(g_hinst, 2, 2, 32, 32, amask, xmask); + hCursor[i] = CreateCursor(hinst, 2, 2, 32, 32, amask, xmask); } } diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp index 6d1a5ef..b9179c6 100644 --- a/src/sys/nact.cpp +++ b/src/sys/nact.cpp @@ -441,6 +441,7 @@ void NACT::select_sound(int dev) } // ƒfƒoƒbƒOƒRƒ“ƒ\�[ƒ‹ +HANDLE hConsole; void NACT::initialize_console() { diff --git a/src/sys/nact.h b/src/sys/nact.h index 71e80a8..8979343 100644 --- a/src/sys/nact.h +++ b/src/sys/nact.h @@ -226,7 +226,6 @@ private: // ƒfƒoƒbƒOƒ�ƒO void initialize_console(); void release_console(); - HANDLE hConsole; public: NACT(); diff --git a/src/win/nact_dialog.cpp b/src/win/nact_dialog.cpp index 8cb658e..eaccb9a 100644 --- a/src/win/nact_dialog.cpp +++ b/src/win/nact_dialog.cpp @@ -11,7 +11,6 @@ #endif extern SDL_Window* g_window; -extern HINSTANCE g_hinst; static BOOL CALLBACK TextDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -74,7 +73,8 @@ static BOOL CALLBACK TextDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l void NACT::text_dialog() { + HINSTANCE hinst = (HINSTANCE)GetModuleHandle(NULL); SDL_SysWMinfo info; SDL_GetWindowWMInfo(g_window, &info); - int r = DialogBoxParam(g_hinst, MAKEINTRESOURCE(IDD_DIALOG1), info.info.win.window, TextDialogProc, (LPARAM)this); + int r = DialogBoxParam(hinst, MAKEINTRESOURCE(IDD_DIALOG1), info.info.win.window, TextDialogProc, (LPARAM)this); }