summaryrefslogtreecommitdiffstats
path: root/src/skel/win
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-18 21:59:16 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-18 21:59:16 +0100
commitef59c623fd3ab492ccc8826d21d93fc4be825257 (patch)
treeb68bb54324eaef4bbb14868413cde00245576859 /src/skel/win
parentfix (diff)
parentwrong ifdef (diff)
downloadre3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.gz
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.bz2
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.lz
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.xz
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.zst
re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.zip
Diffstat (limited to 'src/skel/win')
-rw-r--r--src/skel/win/win.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 53844319..5a0c7db2 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2,7 +2,6 @@
#define _WIN32_WINDOWS 0x0500
#define WINVER 0x0500
-#define DIRECTINPUT_VERSION 0x0800
#include <winerror.h>
#include <windows.h>
@@ -20,13 +19,7 @@
#pragma warning( push )
#pragma warning( disable : 4005)
-#ifdef USE_D3D9
-#include <d3d9.h>
-#else
-#include <d3d8.h>
-#endif
#include <ddraw.h>
-#include <dinput.h>
#include <DShow.h>
#pragma warning( pop )
@@ -41,6 +34,9 @@
#pragma comment( lib, "strmiids.lib" )
#pragma comment( lib, "dinput8.lib" )
+#define WITHD3D
+#define WITHDINPUT
+#include "common.h"
#if (defined(_MSC_VER))
#include <tchar.h>
#endif /* (defined(_MSC_VER)) */
@@ -82,7 +78,6 @@ static psGlobalType PsGlobal;
#define JIF(x) if (FAILED(hr=(x))) \
{debug(TEXT("FAILED(hr=0x%x) in ") TEXT(#x) TEXT("\n"), hr); return;}
-#include "common.h"
#include "main.h"
#include "FileMgr.h"
#include "Text.h"
@@ -93,12 +88,14 @@ static psGlobalType PsGlobal;
#include "Frontend.h"
#include "Game.h"
#include "PCSave.h"
-#include "MemoryCard.h"
-#include "Sprite2d.h"
#include "AnimViewer.h"
-#include "Font.h"
#include "MemoryMgr.h"
+#ifdef PS2_MENU
+#include "MemoryCard.h"
+#include "Font.h"
+#endif
+
VALIDATE_SIZE(psGlobalType, 0x28);
// DirectShow interfaces
@@ -2145,6 +2142,7 @@ WinMain(HINSTANCE instance,
ShowWindow(PSGLOBAL(window), cmdShow);
UpdateWindow(PSGLOBAL(window));
+ // This part is needed because controller initialisation overwrites loaded settings.
{
CFileMgr::SetDirMyDocuments();
@@ -2157,6 +2155,10 @@ WinMain(HINSTANCE instance,
}
CFileMgr::SetDir("");
+
+#ifdef LOAD_INI_SETTINGS
+ LoadINIControllerSettings();
+#endif
}
SetErrorMode(SEM_FAILCRITICALERRORS);