Commits

Felix Krull committed 27fc7b5

Wrap config in namespace.

  • Participants
  • Parent commits 4723058

Comments (0)

Files changed (2)

d3d8_wrapper/Config.h

 }
 #define DEFINE_CONFIG_BOOL(CAT, NAME, DEFAULT) DEFINE_CONFIG_BASE_INT(CAT, NAME, DEFAULT, bool)
 
-
-DEFINE_CONFIG_BOOL(settings, windowed, false);
+namespace cfg {
+    DEFINE_CONFIG_BOOL(settings, windowed, false);
+}

d3d8_wrapper/Direct3D8.h

     }
     virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice8** ppReturnedDeviceInterface) override {
         CComPtr<IDirect3DDevice8> device;
-        pPresentationParameters->Windowed = windowed();
+        pPresentationParameters->Windowed = cfg::windowed();
         auto hr = mWrapped->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, &device);
         if (FAILED(hr)) return hr;
         *ppReturnedDeviceInterface = new Direct3DDevice8(device);