[Scummvm-cvs-logs] SF.net SVN: scummvm:[42967] scummvm/branches/branch-1-0-0/engines/cruise
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sat Aug 1 01:30:23 CEST 2009
Revision: 42967
http://scummvm.svn.sourceforge.net/scummvm/?rev=42967&view=rev
Author: dreammaster
Date: 2009-07-31 23:30:23 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Changed the mouse MB_ constants to the the CRS_MB_ constants as used in Trunk
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.cpp
scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.h
Modified: scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.cpp 2009-07-31 23:28:04 UTC (rev 42966)
+++ scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.cpp 2009-07-31 23:30:23 UTC (rev 42967)
@@ -1390,7 +1390,7 @@
}
// Player Menu - test for both buttons or the F10 key
- if (((button & MB_BOTH) == MB_BOTH) || (keyboardCode == Common::KEYCODE_F10)) {
+ if (((button & CRS_MB_BOTH) == CRS_MB_BOTH) || (keyboardCode == Common::KEYCODE_F10)) {
changeCursor(CURSOR_NORMAL);
keyboardCode = Common::KEYCODE_INVALID;
return (playerMenu(mouseX, mouseY));
@@ -1398,7 +1398,7 @@
if (userWait) {
// Check for left mouse button click or Space to end user waiting
- if ((keyboardCode == Common::KEYCODE_SPACE) || (button == MB_LEFT))
+ if ((keyboardCode == Common::KEYCODE_SPACE) || (button == CRS_MB_LEFT))
userWait = 0;
keyboardCode = Common::KEYCODE_INVALID;
@@ -1450,7 +1450,7 @@
menuDown = 0;
}
} else {
- if ((button & MB_LEFT) && (buttonDown == 0)) {
+ if ((button & CRS_MB_LEFT) && (buttonDown == 0)) {
if (menuTable[0]) {
callRelation(getSelectedEntryInMenu(menuTable[0]), dialogueObj);
@@ -1472,7 +1472,7 @@
}
}
- } else if ((button & MB_LEFT) && (buttonDown == 0)) {
+ } else if ((button & CRS_MB_LEFT) && (buttonDown == 0)) {
// left click
buttonDown = 1;
@@ -1587,7 +1587,7 @@
}
}
}
- } else if ((button & MB_RIGHT) || (keyboardCode == Common::KEYCODE_F9)) {
+ } else if ((button & CRS_MB_RIGHT) || (keyboardCode == Common::KEYCODE_F9)) {
if (buttonDown == 0) {
keyboardCode = Common::KEYCODE_INVALID;
Modified: scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.h 2009-07-31 23:28:04 UTC (rev 42966)
+++ scummvm/branches/branch-1-0-0/engines/cruise/cruise_main.h 2009-07-31 23:30:23 UTC (rev 42967)
@@ -56,10 +56,10 @@
namespace Cruise {
enum MouseButton {
- MB_LEFT = 1,
- MB_RIGHT = 2,
- MB_MIDDLE = 4,
- MB_BOTH = MB_LEFT | MB_RIGHT
+ CRS_MB_LEFT = 1,
+ CRS_MB_RIGHT = 2,
+ CRS_MB_MIDDLE = 4,
+ CRS_MB_BOTH = CRS_MB_LEFT | CRS_MB_RIGHT
};
/*#define DUMP_SCRIPT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list