diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index 42dba4bd..b3b85dc8 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -2,7 +2,7 @@ ;v3.8.33 [Main] -;Set to 1 if you want to use command line args to tell sfall to use another ini file +;Set to 1 if you want to use command line arguments to tell sfall to use another ini file ;This option is always enabled in 4.3.3/3.8.33 or later. The information is left for reference only UseCommandLine=0 diff --git a/sfall/InputFuncs.cpp b/sfall/InputFuncs.cpp index 375cca7d..2966be56 100644 --- a/sfall/InputFuncs.cpp +++ b/sfall/InputFuncs.cpp @@ -454,6 +454,7 @@ typedef HRESULT (__stdcall *DInputCreateProc)(HINSTANCE a,DWORD b,IDirectInputA* HRESULT __stdcall FakeDirectInputCreate(HINSTANCE a, DWORD b, IDirectInputA** c, IUnknown* d) { HMODULE dinput = LoadLibraryA("dinput.dll"); if (!dinput || dinput == INVALID_HANDLE_VALUE) return -1; + DInputCreateProc proc = (DInputCreateProc)GetProcAddress(dinput, "DirectInputCreateA"); if (!proc) return -1; diff --git a/sfall/Modules/Graphics.cpp b/sfall/Modules/Graphics.cpp index a2df3d2e..b3015075 100644 --- a/sfall/Modules/Graphics.cpp +++ b/sfall/Modules/Graphics.cpp @@ -680,12 +680,11 @@ public: int height = mveDesc.dwHeight; int pitch = dRect.Pitch / 4; DWORD* pBits = (DWORD*)dRect.pBits; - BYTE* target = mveSurface; while (height--) { int x = width; - while (x--) pBits[x] = palette[target[x]].xRGB; - target += width; + while (x--) pBits[x] = palette[mveSurface[x]].xRGB; + mveSurface += width; pBits += pitch; } } diff --git a/sfall/Modules/Sound.cpp b/sfall/Modules/Sound.cpp index 932492fc..25721cb7 100644 --- a/sfall/Modules/Sound.cpp +++ b/sfall/Modules/Sound.cpp @@ -1106,7 +1106,7 @@ void Sound::init() { MakeCall(0x4450C5, gdialogFreeSpeech_hack, 2); // Prepare - LoadLibraryA("quartz.dll"); + //LoadLibraryA("quartz.dll"); CreateSndWnd(); }