[Scummvm-cvs-logs] scummvm master -> e8f2742cc789b54d22ed5d47e45938474ea608e9

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9989a4f3da WINTERMUTE: Remove extra semicolon.
e8f2742cc7 WINTERMUTE: Replace VKeyCodes constant names.


Commit: 9989a4f3daba891326810d7ae620cd75d97521f1
    https://github.com/scummvm/scummvm/commit/9989a4f3daba891326810d7ae620cd75d97521f1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T10:41:58-07:00

Commit Message:
WINTERMUTE: Remove extra semicolon.

Changed paths:
    engines/wintermute/base/base_keyboard_state.cpp



diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index 63c0a87..c8dc02c 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -277,7 +277,7 @@ enum VKeyCodes {
     VK_UP = 38,

     VK_RIGHT = 39,

     VK_DOWN = 40

-};

+}

 

 //////////////////////////////////////////////////////////////////////////

 Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {



Commit: e8f2742cc789b54d22ed5d47e45938474ea608e9
    https://github.com/scummvm/scummvm/commit/e8f2742cc789b54d22ed5d47e45938474ea608e9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T10:43:15-07:00

Commit Message:
WINTERMUTE: Replace VKeyCodes constant names.

This is a purely cosmetical change, which should help compilation on systems,
which use VK_* for internal constants. This should help compilation for WinCE.

Changed paths:
    engines/wintermute/base/base_keyboard_state.cpp



diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index c8dc02c..c8a6ccd 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -272,30 +272,30 @@ uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {
 }

 

 enum VKeyCodes {

-    VK_SPACE = 32,

-    VK_LEFT = 37,

-    VK_UP = 38,

-    VK_RIGHT = 39,

-    VK_DOWN = 40

+	kVkSpace = 32,

+	kVkLeft  = 37,

+	kVkUp    = 38,

+	kVkRight = 39,

+	kVkDown  = 40

 }

 

 //////////////////////////////////////////////////////////////////////////

 Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {

 	// todo

 	switch (vkey) {

-	case VK_SPACE:

+	case kVkSpace:

 		return Common::KEYCODE_SPACE;

 		break;

-	case VK_LEFT:

+	case kVkLeft:

 		return Common::KEYCODE_LEFT;

 		break;

-	case VK_RIGHT:

+	case kVkRight:

 		return Common::KEYCODE_RIGHT;

 		break;

-	case VK_UP:

+	case kVkUp:

 		return Common::KEYCODE_UP;

 		break;

-	case VK_DOWN:

+	case kVkDown:

 		return Common::KEYCODE_DOWN;

 		break;

 	default: