--- a/Render.h	Mon Oct 07 21:56:47 2013 +0600
+++ b/Render.h	Mon Oct 07 21:57:01 2013 +0600
@@ -4,7 +4,7 @@
 #include <cstdio>
 
 #include "lib\legacy_dx\d3d.h"
-#include "OSAPI.h"
+#include "OSWindow.h"
 
 #include "VectorTypes.h"
 
@@ -269,8 +269,7 @@
 
   static Render *Create() {return new Render;}
 
-  bool Initialize(bool bWindowed, int window_width, int window_height, uint32_t uDefaultDevice,
-                  bool bColoredLights, uint32_t uDetailLevel, bool bTinting);
+  bool Initialize(bool bWindowed, OSWindow *window, bool bColoredLights, uint32_t uDetailLevel, bool bTinting);
 
 
   bool IsColorKeySupported(IDirectDraw4 *);
@@ -288,8 +287,8 @@
   void CreateZBuffer();
   void Release();
   void CreateSomeTexture();
-  bool InitializeFullscreen(HWND hWnd);
-  bool SwitchToWindow(HWND hWnd);
+  bool InitializeFullscreen();
+  bool SwitchToWindow();
   char RasterLine2D(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW, unsigned __int16 uColor);
   void ClearZBuffer(int a2, int a3);
   void SetRasterClipRect(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW);
@@ -305,7 +304,6 @@
   void CreateClipper(HWND a2);
   void GetTargetPixelFormat(DDPIXELFORMAT *pOut);
   void LockRenderSurface(void **pOutSurfacePtr, unsigned int *pOutPixelsPerRow);
-  bool UsingDirect3D();
   void UnlockBackBuffer();
   void LockFrontBuffer(void **pOutSurface, unsigned int *pOutPixelsPerRow);
   void UnlockFrontBuffer();
@@ -373,7 +371,7 @@
   void DrawBillboardList_BLV();
 
 
-  unsigned int bUserDirect3D;
+  //unsigned int bUserDirect3D;
   unsigned int bStartInWindow;
   unsigned int uDesiredDirect3DDevice;
   unsigned int uAcquiredDirect3DDevice;
@@ -395,7 +393,8 @@
   int field_40044;
   int field_40048;
   int field_4004C;
-  HWND hWnd;
+  //HWND hWnd;
+  OSWindow *window;
   int field_40054;
   unsigned int bWindowMode;
   int field_4005C[11];
@@ -459,8 +458,8 @@
   unsigned __int16 *pCurrentlyLockedSoftSurface;
 
 
-  int windowed_mode_width;
-  int windowed_mode_height;
+  //int windowed_mode_width;
+  //int windowed_mode_height;
 };
 #pragma pack(pop)