Remove obsolete lines

diff --git a/od-win32/render.h b/od-win32/render.h
index e77b819f19c4c6ab5443ddf424f0b32d4968245f..364650d39336f73d2bc9a54ad9633c10c006badf 100644 (file)
--- a/od-win32/render.h
+++ b/od-win32/render.h
@@ -2,48 +2,11 @@
 #define __DXWRAP_H__
 
 #include "rtgmodes.h"
-#include <ddraw.h>
 #include <d3d9.h>
 #include <D3dkmthk.h>
 
 #define MAX_DISPLAYS 10
 
-extern int ddforceram;
-extern int useoverlay;
-
-struct ddstuff
-{
-       int ddinit;
-       int ddzeroguid;
-       GUID ddguid;
-       LPDIRECTDRAW7 maindd;
-       LPDIRECTDRAWCLIPPER dclip;
-       LPDIRECTDRAWSURFACE7 primary, secondary, flipping[2];
-       DDOVERLAYFX overlayfx;
-       DWORD overlayflags;
-       int fsmodeset, backbuffers;
-       int width, height, depth, freq;
-       int vblank_skip, vblank_skip_cnt;
-       int swidth, sheight;
-       DDSURFACEDESC2 native;
-       DDSURFACEDESC2 locksurface;
-       int lockcnt;
-       DWORD pitch;
-       HWND hwnd;
-       uae_u32 colorkey;
-       int islost, isoverlay;
-
-       LPDIRECTDRAWSURFACE7 statussurface;
-};
-struct ddcaps
-{
-       int maxwidth, maxheight;
-       int cancolorkey;
-       int cannonlocalvidmem;
-};
-extern struct ddstuff dxdata;
-extern struct ddcaps dxcaps;
-
 struct ScreenResolution
 {
        uae_u32 width;  /* in pixels */

diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index 2e672fdda55036ca78f232094286af6261f22e7a..ee03e21980aa561da799466dee8fd981f0ce549c 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -19,7 +19,6 @@
 #define IDS_CPU                         12
 #define IDS_CHIPSET                     13
 #define IDS_INPUT                       14
-#define IDS_OPENGL                      15
 #define IDS_FILTER                      15
 #define IDS_MISC2                       16
 #define IDS_PATHS                       17
@@ -132,7 +131,6 @@
 #define IDI_AVIOUTPUT                   158
 #define IDS_ERRORTITLE                  159
 #define IDS_SELECTFILESYSROOT           160
-#define IDD_OPENGL                      160
 #define IDD_FILTER                      160
 #define IDS_DEFAULTMIDIOUT              161
 #define IDS_DEFAULTMIDIIN               162
@@ -1225,7 +1223,6 @@
 #define IDC_INPUTMAPLIST                1797
 #define IDC_RTG_HWSPRITE                1797
 #define IDC_PORT1_REMAP                 1798
-#define IDC_RTG_SCALE_ALLOW2            1798
 #define IDC_RTG_CENTER                  1798
 #define IDC_PORT0_REMAP                 1799
 #define IDC_RTG_Z2Z4                    1799

diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp
index 5b2e2f5b5fa393f9eb5660d2e98890b5538e92f1..aa2c2d7e88ba62e85f6c68b3228b5e29cc26acba 100644 (file)
--- a/od-win32/screenshot.cpp
+++ b/od-win32/screenshot.cpp
@@ -784,7 +784,7 @@ static int filenumber = 0;
 static int dirnumber = 1;
 
 /*
-Captures the Amiga display (GDI, D3D or OpenGL) surface and saves it to file as a 24bit bitmap.
+Captures the Amiga display (GDI, D3D) surface and saves it to file as a 24bit bitmap.
 */
 int screenshotf(int monid, const TCHAR *spath, int mode, int doprepare, int imagemode, struct vidbuffer *vb)
 {