.gitignore

@@ -18,11 +18,4 @@
 /msvc5/sb2decomp/*.plg
 /msvc5/sb2decomp/Debug
 /msvc5/sb2decomp/Release
-Speedy Eggbert 2 Source.vcxproj.user
+Speedy Eggbert 2 Source.vcxproj.user
-
-
-
-DATA/*
-IMAGE08/*
-IMAGE16/*
-SOUND/*

README.md

@@ -70,7 +70,7 @@ https://drive.openeggbert.com/other/Visual_Studio_Community_2017.exe
 
 Click on "Speedy Eggbert 2 Source.sln" and select Open with "Microsoft Visual Studio 2017"
 
-Set the Platform to x86 and Debugging to Win32.
+Set the Platform to x86 and debugging to Win32.
 
 #### Set "Additional Options"
 
@@ -78,10 +78,6 @@ Properties / Configuration Properties / C/C++ / Command Line / Additional Option
 
 Add : /wd4700 /wd4703
 
-#### Platform Toolset - v140
-
-Project Properties > General > change Platform Toolset from v140_xp to v140, 
-
 #### Build
 
 Click with the right mouse button on "Speedy Eggbert 2 Source.sln"

Speedy Eggbert 2 Source.vcxproj

@@ -23,13 +23,14 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e424a3cb-c8b8-447c-be63-41a57e65b449}</ProjectGuid>
     <RootNamespace>SpeedyEggbert2Source</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>
+    </WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -83,7 +84,6 @@
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalOptions>/wd4700 /wd4703 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

src/blupi.cpp

@@ -3,8 +3,6 @@
 
 #define WIN32_LEAN_AND_MEAN
 
-typedef struct IUnknown IUnknown;
-
 #include <windows.h>
 #include <windowsx.h>
 #include <WTypes.h>

src/button.cpp

@@ -6,8 +6,6 @@
 //#include <stdio.h>
 //#include <ddraw.h>
 
-typedef struct IUnknown IUnknown;
-
 #ifndef POINT
 #include <windows.h>
 #endif

src/ddutil.cpp

@@ -6,9 +6,6 @@
  *  Content:    Routines for loading bitmap and palettes from resources
  *
  ***************************************************************************/
-
-typedef struct IUnknown IUnknown;
-
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

src/decblock.cpp

@@ -1,9 +1,6 @@
 // DecBlock.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include "def.h"
 #include "decor.h"
 #include "misc.h"

src/decblupi.cpp

@@ -1,8 +1,6 @@
 // DecBlupi.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
 #include "misc.h"
 #include "decor.h"
 #include "text.h" // debug

src/decdesign.cpp

@@ -1,9 +1,6 @@
 // DecDesign.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include "def.h"
 #include "decor.h"
 #include "misc.h"

src/decio.cpp

@@ -1,9 +1,6 @@
 // DecIO.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include "def.h"
 #include "decor.h"
 #include "misc.h"

src/decmove.cpp

@@ -1,9 +1,6 @@
 // DecMove.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include "def.h"
 #include "decor.h"
 #include "misc.h"

src/decnet.cpp

@@ -1,9 +1,6 @@
 // DecNet.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include "def.h"
 #include "decor.h"
 #include "misc.h"

src/decor.cpp

@@ -1,9 +1,6 @@
 // Decor.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 //#include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>

src/def.h

@@ -1363,44 +1363,32 @@ POINT operator/(POINT p, const int& a)
 
 POINT& operator+=(POINT& p, const POINT& a)
 {
-	p.x += a.x;
+	return POINT( p.x += a.x, p.y += a.y );
-	p.y += a.y;
-	return p;
 }
 
 POINT& operator-=(POINT& p, const POINT& a)
 {
-	p.x -= a.x;
+	return POINT( p.x -= a.x, p.y -= a.y );
-	p.y -= a.y;
-	return p;
 }
 
 POINT& operator*=(POINT& p, const POINT& a)
 {
-	p.x *= a.x;
+	return POINT( p.x *= a.x, p.y *= a.y );
-	p.y *= a.y;
-	return p;
 }
 
 POINT& operator/=(POINT& p, const POINT& a)
 {
-	p.x /= a.x;
+	return POINT( p.x /= a.x, p.y /= a.y );
-	p.y /= a.y;
-	return p;
 }
 
 POINT& operator*=(POINT& p, const int& a)
 {
-	p.x *= a;
+	return POINT( p.x *= a, p.y *= a );
-	p.y *= a;
-	return p;
 }
 
 POINT& operator/=(POINT& p, const int& a)
 {
-	p.x /= a;
+	return POINT( p.x /= a, p.y /= a );
-	p.y /= a;
-	return p;
 }
 
 bool operator!=(POINT a, const POINT& b)

src/event.cpp

@@ -1,9 +1,6 @@
 // Event.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -2426,7 +2423,7 @@ BOOL CEvent::DrawButtons()
 
 	if (m_phase == WM_PHASE_INIT)
 	{
-		DrawText(m_pPixmap, POINT( 414, 446 ), const_cast<char*>("Version 2.2"), FONTLITTLE);
+		DrawText(m_pPixmap, POINT( 414, 446 ), "Version 2.2", FONTLITTLE);
 	}
 
 	if (m_phase == WM_PHASE_GAMER)
@@ -2912,7 +2909,7 @@ BOOL CEvent::DrawButtons()
 	// now that the decomp is looking convincingly like the retail game,
 	// we should clearly differentiate the two when sharing WIP screenshots/videos to reduce confusion.
 	{
-		DrawTextLeft(m_pPixmap, POINT(LXIMAGE - GetTextWidth(const_cast<char*>("DECOMP -- " __DATE__)), 0), const_cast<char*>("DECOMP -- " __DATE__), FONTGOLD);
+		DrawTextLeft(m_pPixmap, POINT(LXIMAGE - GetTextWidth("DECOMP -- " __DATE__), 0), "DECOMP -- " __DATE__, FONTGOLD);
 	}
 	///////
 

src/jauge.cpp

@@ -1,9 +1,6 @@
 // Jauge.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>

src/menu.cpp

@@ -1,8 +1,6 @@
 // Menu.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>

src/misc.cpp

@@ -1,9 +1,6 @@
 // Misc.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include <dsound.h>
 #include <ddraw.h>
 #include <stdio.h>

src/movie.cpp

@@ -1,9 +1,6 @@
 // movie.cpp
 //
 
-typedef struct IUnknown IUnknown;
-
-
 #include <windows.h>
 #include <windowsx.h>
 #include <commdlg.h>
@@ -36,7 +33,7 @@ BOOL CMovie::initAVI()
 	// set up the open parameters
 	mciOpen.dwCallback 		 = 0L;
 	mciOpen.wDeviceID 		 = 0;
-	mciOpen.lpstrDeviceType  = const_cast<char*>(AVI_VIDEO);
+	mciOpen.lpstrDeviceType  = AVI_VIDEO;
 	mciOpen.lpstrElementName = NULL;
 	mciOpen.lpstrAlias 		 = NULL;
 	mciOpen.dwStyle 		 = 0;

src/network.cpp

@@ -1,9 +1,6 @@
 // Network.cpp
 //
 
-
-typedef struct IUnknown IUnknown;
-
 #include <stdio.h>
 #include <windows.h>
 #include "dplay.h"

src/pixmap.cpp

@@ -1,9 +1,6 @@
 // CPixmap.cpp
 //
 
-
-typedef struct IUnknown IUnknown;
-
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>

src/sound.cpp

@@ -1,8 +1,5 @@
 // sound.cpp
 //
-
-typedef struct IUnknown IUnknown;
-
 #include "def.h"
 
 #if _BASS && !_LEGACY

src/text.cpp

@@ -1,8 +1,5 @@
 // Text.cpp
 
-typedef struct IUnknown IUnknown;
-
-
 //#include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>

src/wave.cpp

@@ -9,8 +9,6 @@
  *
  ******************************************************************/
 
-typedef struct IUnknown IUnknown;
-
 #include <windows.h>
 #include "wave.h"