From 566dd20e4f9ecad6d6b96bd720673f80282350ff Mon Sep 17 00:00:00 2001
From: Denis Kasak
Date: Thu, 25 Jun 2009 15:08:49 +0000
Subject: Renamed *cursorNum identifiers in Mouse to *cursorType for
 consistency.

svn-id: r41866
---
 engines/draci/draci.cpp | 2 +-
 engines/draci/mouse.cpp | 8 ++++----
 engines/draci/mouse.h   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp
index 36c65fdbb3..457119cbbd 100644
--- a/engines/draci/draci.cpp
+++ b/engines/draci/draci.cpp
@@ -188,7 +188,7 @@ int DraciEngine::go() {
 		debugC(5, kDraciGeneralDebugLevel, "Finished frame %d", t);	
 	}
 
-	_mouse->setCursorNum(kNormalCursor);
+	_mouse->setCursorType(kNormalCursor);
 	_mouse->cursorOn();
 
 	Common::Event event;
diff --git a/engines/draci/mouse.cpp b/engines/draci/mouse.cpp
index 83ae0bab1a..c1a4e7bc21 100644
--- a/engines/draci/mouse.cpp
+++ b/engines/draci/mouse.cpp
@@ -34,7 +34,7 @@ Mouse::Mouse(DraciEngine *vm) {
 	_y = 0;
 	_lButton = false;
 	_rButton = false;
-	_cursorNum = kNormalCursor;
+	_cursorType = kNormalCursor;
 	_vm = vm;
 }
 
@@ -81,8 +81,8 @@ void Mouse::setPosition(uint16 x, uint16 y) {
 
 // FIXME: Handle hotspots properly
 // TODO: Implement a resource manager
-void Mouse::setCursorNum(CursorType cursorNum) {
-	_cursorNum = cursorNum;
+void Mouse::setCursorType(CursorType cur) {
+	_cursorType = cur;
 	
 	Common::String path("HRA.DFW");
 	BAFile *f;
@@ -90,7 +90,7 @@ void Mouse::setCursorNum(CursorType cursorNum) {
 	ar.openArchive(path);
 	
 	if(ar.isOpen()) {
-		f = ar[cursorNum];	
+		f = ar[_cursorType];	
 	} else {
 		debugC(2, kDraciGeneralDebugLevel, "ERROR - Archive not opened - %s", path.c_str());
 		return;
diff --git a/engines/draci/mouse.h b/engines/draci/mouse.h
index cb14c14383..918b10d75f 100644
--- a/engines/draci/mouse.h
+++ b/engines/draci/mouse.h
@@ -49,8 +49,8 @@ public:
 	void cursorOn();
 	void cursorOff();
 	void setPosition(uint16 x, uint16 y);
-	void setCursorNum(CursorType cursorNum);
-	CursorType getCursorNum() { return _cursorNum; }
+	void setCursorType(CursorType cur);
+	CursorType getCursorType() { return _cursorType; }
 	bool lButtonPressed() { return _lButton; }
 	bool rButtonPressed() { return _rButton; }
 	uint16 getPosX() { return _x; }
@@ -59,7 +59,7 @@ public:
 private:
 	uint16 _x, _y;
 	bool _lButton, _rButton;
-	CursorType _cursorNum;
+	CursorType _cursorType;
 	DraciEngine *_vm;
 };
 
-- 
cgit v1.2.3