[Scummvm-cvs-logs] scummvm master -> 92bc524984265071c012205f489747ef16caa7d3

bluegr bluegr at gmail.com
Thu Dec 24 18:45:22 CET 2015


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

Summary:
92bc524984 LAB: Rename kMessageDeltaMove to kMessageMoveCursorToCloseup


Commit: 92bc524984265071c012205f489747ef16caa7d3
    https://github.com/scummvm/scummvm/commit/92bc524984265071c012205f489747ef16caa7d3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-24T19:44:42+02:00

Commit Message:
LAB: Rename kMessageDeltaMove to kMessageMoveCursorToCloseup

Changed paths:
    engines/lab/engine.cpp
    engines/lab/eventman.h



diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 499ae79..6b06f3b 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -611,7 +611,7 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
 
 		mayShowCrumbIndicator();
 		_graphics->screenUpdate();
-	} else if (msgClass == kMessageDeltaMove) {
+	} else if (msgClass == kMessageMoveCursorToCloseup) {
 		ViewData *vptr = getViewData(_roomNum, _direction);
 		CloseDataPtr oldClosePtr = vptr->_closeUps;
 		CloseDataPtr tmpClosePtr = _closeDataPtr;
@@ -715,7 +715,7 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
 		forceDraw = true;
 		interfaceOn();
 	} else if (code == Common::KEYCODE_TAB)
-		msgClass = kMessageDeltaMove;
+		msgClass = kMessageMoveCursorToCloseup;
 	else if (code == Common::KEYCODE_ESCAPE)
 		_closeDataPtr = nullptr;
 
diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h
index 3a10fb9..ec8f824 100644
--- a/engines/lab/eventman.h
+++ b/engines/lab/eventman.h
@@ -43,7 +43,7 @@ enum MessageClasses {
 	kMessageRightClick,
 	kMessageButtonUp,
 	kMessageRawKey,
-	kMessageDeltaMove
+	kMessageMoveCursorToCloseup
 };
 
 struct IntuiMessage {
@@ -56,7 +56,7 @@ struct IntuiMessage {
 
 struct Button {
 	uint16 _x, _y, _buttonId;
-	Common::KeyCode _keyEquiv; // if not zero, a key that activates button
+	Common::KeyCode _keyEquiv; // the key which activates this button
 	bool _isEnabled;
 	Image *_image, *_altImage;
 };






More information about the Scummvm-git-logs mailing list