cpp/openttd-patchpack/source Changeset - r394:08a38cdff724

Changeset - r394:08a38cdff724

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

darkvater - 20 years ago 2004-11-14 12:37:23
darkvater@openttd.org

(svn r586) -Fix: [1066114] Code error in win32.c Thanks Shai
-Fix: ttd.vcproj change to hard-set compilation as C, as well as adding WITH_SDL to debug mode. If you don't have SDL just remove that.

2 files changed with 14 insertions and 11 deletions:

ttd.vcproj

win32.c

0 comments (0 inline, 0 general)

ttd.vcproj

➞

Show inline comments

@@ @@ -46,7 +46,8 @@ @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"/>
 				DebugInformationFormat="3"
 				CompileAs="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ @@ -119,7 +120,8 @@ @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"
 				CallingConvention="1"/>
 				CallingConvention="1"
 				CompileAs="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ @@ -170,6 +172,7 @@ @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;WITH_SDL&quot;"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_PNG"
 				BasicRuntimeChecks="3"
@@ @@ -183,7 +186,8 @@ @@
 				WarningLevel="3"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
 				DebugInformationFormat="4"
 				CompileAs="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool

win32.c

➞

Show inline comments

@@ @@ -284,27 +284,26 @@ static LRESULT CALLBACK WndProcGdi(HWND @@
 		return 0;
+	}
 	case WM_KEYDOWN:
+		{
 	case WM_KEYDOWN: {
 		// this is the rewritten ascii input function
 		// it disables windows deadkey handling --> more linux like :D
-        unsigned short w = 0;
     unsigned short w = 0;
 		int r = 0;
 		byte ks[256];
 		unsigned int scan=0;
+		unsigned int scan = 0;
 		GetKeyboardState(ks);
 		r=ToAscii(wParam,scan,ks,&w,0);
 		if (r=0) w=0;
 		r = ToAscii(wParam, scan, ks, &w, 0);
 		if (r == 0) w = 0; // no translation was possible
 		_pressed_key = w | MapWindowsKey(wParam) << 16;
+		}
 		if ((_pressed_key>>16) == ('D' | WKC_CTRL) && !_wnd.fullscreen) {
 			_double_size ^= 1;
 			_wnd.double_size = _double_size;
 			ClientSizeChanged(_wnd.width, _wnd.height);
 			MarkWholeScreenDirty();
+		}
 		break;
+	}	break;
 	case WM_SYSKEYDOWN: /* user presses F10 or Alt, both activating the title-menu */

0 comments (0 inline, 0 general)