[Scummvm-cvs-logs] SF.net SVN: scummvm:[41866] scummvm/branches/gsoc2009-draci/engines/draci
dkasak13 at users.sourceforge.net
dkasak13 at users.sourceforge.net
Thu Jun 25 17:08:50 CEST 2009
Revision: 41866
http://scummvm.svn.sourceforge.net/scummvm/?rev=41866&view=rev
Author: dkasak13
Date: 2009-06-25 15:08:49 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Renamed *cursorNum identifiers in Mouse to *cursorType for consistency.
Modified Paths:
--------------
scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp
scummvm/branches/gsoc2009-draci/engines/draci/mouse.h
Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp 2009-06-25 14:03:57 UTC (rev 41865)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp 2009-06-25 15:08:49 UTC (rev 41866)
@@ -188,7 +188,7 @@
debugC(5, kDraciGeneralDebugLevel, "Finished frame %d", t);
}
- _mouse->setCursorNum(kNormalCursor);
+ _mouse->setCursorType(kNormalCursor);
_mouse->cursorOn();
Common::Event event;
Modified: scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp 2009-06-25 14:03:57 UTC (rev 41865)
+++ scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp 2009-06-25 15:08:49 UTC (rev 41866)
@@ -34,7 +34,7 @@
_y = 0;
_lButton = false;
_rButton = false;
- _cursorNum = kNormalCursor;
+ _cursorType = kNormalCursor;
_vm = vm;
}
@@ -81,8 +81,8 @@
// 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 @@
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;
Modified: scummvm/branches/gsoc2009-draci/engines/draci/mouse.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/mouse.h 2009-06-25 14:03:57 UTC (rev 41865)
+++ scummvm/branches/gsoc2009-draci/engines/draci/mouse.h 2009-06-25 15:08:49 UTC (rev 41866)
@@ -49,8 +49,8 @@
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 @@
private:
uint16 _x, _y;
bool _lButton, _rButton;
- CursorType _cursorNum;
+ CursorType _cursorType;
DraciEngine *_vm;
};
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