[Scummvm-cvs-logs] SF.net SVN: scummvm:[47902] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Fri Feb 5 14:05:27 CET 2010
Revision: 47902
http://scummvm.svn.sourceforge.net/scummvm/?rev=47902&view=rev
Author: m_kiewitz
Date: 2010-02-05 13:05:26 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
SCI: renamed class Cursor to GfxCursor
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/animate.cpp
scummvm/trunk/engines/sci/graphics/animate.h
scummvm/trunk/engines/sci/graphics/cursor.cpp
scummvm/trunk/engines/sci/graphics/cursor.h
scummvm/trunk/engines/sci/graphics/gui.cpp
scummvm/trunk/engines/sci/graphics/gui.h
scummvm/trunk/engines/sci/graphics/gui32.cpp
scummvm/trunk/engines/sci/graphics/gui32.h
scummvm/trunk/engines/sci/graphics/menu.cpp
scummvm/trunk/engines/sci/graphics/menu.h
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -42,7 +42,7 @@
namespace Sci {
-GfxAnimate::GfxAnimate(EngineState *state, GfxCache *cache, GfxPorts *ports, GfxPaint16 *paint16, GfxScreen *screen, GfxPalette *palette, Cursor *cursor, GfxTransitions *transitions)
+GfxAnimate::GfxAnimate(EngineState *state, GfxCache *cache, GfxPorts *ports, GfxPaint16 *paint16, GfxScreen *screen, GfxPalette *palette, GfxCursor *cursor, GfxTransitions *transitions)
: _s(state), _cache(cache), _ports(ports), _paint16(paint16), _screen(screen), _palette(palette), _cursor(cursor), _transitions(transitions) {
init();
}
Modified: scummvm/trunk/engines/sci/graphics/animate.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.h 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/animate.h 2010-02-05 13:05:26 UTC (rev 47902)
@@ -75,6 +75,7 @@
typedef Common::List<AnimateEntry *> AnimateList;
class GfxCache;
+class GfxCursor;
class GfxPorts;
class GfxPaint16;
class GfxScreen;
@@ -82,7 +83,7 @@
class GfxTransitions;
class GfxAnimate {
public:
- GfxAnimate(EngineState *state, GfxCache *cache, GfxPorts *ports, GfxPaint16 *paint16, GfxScreen *screen, GfxPalette *palette, Cursor *cursor, GfxTransitions *transitions);
+ GfxAnimate(EngineState *state, GfxCache *cache, GfxPorts *ports, GfxPaint16 *paint16, GfxScreen *screen, GfxPalette *palette, GfxCursor *cursor, GfxTransitions *transitions);
virtual ~GfxAnimate();
// FIXME: Don't store EngineState
@@ -118,7 +119,7 @@
GfxPaint16 *_paint16;
GfxScreen *_screen;
GfxPalette *_palette;
- Cursor *_cursor;
+ GfxCursor *_cursor;
GfxTransitions *_transitions;
uint16 _listCount;
Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -36,7 +36,7 @@
namespace Sci {
-Cursor::Cursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen)
+GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen)
: _resMan(resMan), _palette(palette), _screen(screen) {
_upscaledHires = _screen->getUpscaledHires();
@@ -47,25 +47,25 @@
_isVisible = true;
}
-Cursor::~Cursor() {
+GfxCursor::~GfxCursor() {
purgeCache();
}
-void Cursor::show() {
+void GfxCursor::show() {
CursorMan.showMouse(true);
_isVisible = true;
}
-void Cursor::hide() {
+void GfxCursor::hide() {
CursorMan.showMouse(false);
_isVisible = false;
}
-bool Cursor::isVisible() {
+bool GfxCursor::isVisible() {
return _isVisible;
}
-void Cursor::purgeCache() {
+void GfxCursor::purgeCache() {
for (CursorCache::iterator iter = _cachedCursors.begin(); iter != _cachedCursors.end(); ++iter) {
delete iter->_value;
iter->_value = 0;
@@ -74,7 +74,7 @@
_cachedCursors.clear();
}
-void Cursor::setShape(GuiResourceId resourceId) {
+void GfxCursor::setShape(GuiResourceId resourceId) {
Resource *resource;
byte *resourceData;
Common::Point hotspot = Common::Point(0, 0);
@@ -133,7 +133,7 @@
delete[] rawBitmap;
}
-void Cursor::setView(GuiResourceId viewNum, int loopNum, int celNum, Common::Point *hotspot) {
+void GfxCursor::setView(GuiResourceId viewNum, int loopNum, int celNum, Common::Point *hotspot) {
if (_cachedCursors.size() >= MAX_CACHED_CURSORS)
purgeCache();
@@ -180,7 +180,7 @@
delete cursorHotspot;
}
-void Cursor::setPosition(Common::Point pos) {
+void GfxCursor::setPosition(Common::Point pos) {
if (!_upscaledHires) {
g_system->warpMouse(pos.x, pos.y);
} else {
@@ -188,7 +188,7 @@
}
}
-Common::Point Cursor::getPosition() {
+Common::Point GfxCursor::getPosition() {
Common::Point mousePos = g_system->getEventManager()->getMousePos();
if (_upscaledHires) {
@@ -199,7 +199,7 @@
return mousePos;
}
-void Cursor::refreshPosition() {
+void GfxCursor::refreshPosition() {
bool clipped = false;
Common::Point mousePoint = getPosition();
Modified: scummvm/trunk/engines/sci/graphics/cursor.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.h 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/cursor.h 2010-02-05 13:05:26 UTC (rev 47902)
@@ -40,10 +40,10 @@
typedef Common::HashMap<int, GfxView *> CursorCache;
-class Cursor {
+class GfxCursor {
public:
- Cursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen);
- ~Cursor();
+ GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen);
+ ~GfxCursor();
void show();
void hide();
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -50,7 +50,7 @@
namespace Sci {
-SciGui::SciGui(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, Cursor *cursor, GfxPorts *ports, AudioPlayer *audio)
+SciGui::SciGui(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor, GfxPorts *ports, AudioPlayer *audio)
: _s(state), _screen(screen), _palette(palette), _cache(cache), _cursor(cursor), _ports(ports), _audio(audio) {
_compare = new GfxCompare(_s->_segMan, _s->_kernel, _cache, _screen);
Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/gui.h 2010-02-05 13:05:26 UTC (rev 47902)
@@ -43,7 +43,7 @@
class GfxScreen;
class GfxPalette;
-class Cursor;
+class GfxCursor;
class GfxCache;
class GfxCompare;
class GfxPorts;
@@ -56,7 +56,7 @@
class SciGui {
public:
- SciGui(EngineState *s, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, Cursor *cursor, GfxPorts *ports, AudioPlayer *audio);
+ SciGui(EngineState *s, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor, GfxPorts *ports, AudioPlayer *audio);
virtual ~SciGui();
virtual void init(bool usesOldGfxFunctions);
@@ -109,7 +109,7 @@
virtual void resetEngineState(EngineState *s);
protected:
- Cursor *_cursor;
+ GfxCursor *_cursor;
EngineState *_s;
GfxScreen *_screen;
GfxPalette *_palette;
Modified: scummvm/trunk/engines/sci/graphics/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/gui32.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -45,7 +45,7 @@
namespace Sci {
-SciGui32::SciGui32(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, Cursor *cursor)
+SciGui32::SciGui32(EngineState *state, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor)
: _s(state), _screen(screen), _palette(palette), _cache(cache), _cursor(cursor) {
_compare = new GfxCompare(_s->_segMan, _s->_kernel, _cache, _screen);
Modified: scummvm/trunk/engines/sci/graphics/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.h 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/gui32.h 2010-02-05 13:05:26 UTC (rev 47902)
@@ -30,7 +30,7 @@
namespace Sci {
-class Cursor;
+class GfxCursor;
class GfxScreen;
class GfxPalette;
class GfxCache;
@@ -40,7 +40,7 @@
class SciGui32 {
public:
- SciGui32(EngineState *s, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, Cursor *cursor);
+ SciGui32(EngineState *s, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor);
~SciGui32();
void init();
@@ -83,7 +83,7 @@
void resetEngineState(EngineState *s);
protected:
- Cursor *_cursor;
+ GfxCursor *_cursor;
EngineState *_s;
GfxScreen *_screen;
GfxPalette *_palette;
Modified: scummvm/trunk/engines/sci/graphics/menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/menu.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/menu.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -43,7 +43,7 @@
namespace Sci {
-GfxMenu::GfxMenu(SciEvent *event, SegManager *segMan, SciGui *gui, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen, Cursor *cursor)
+GfxMenu::GfxMenu(SciEvent *event, SegManager *segMan, SciGui *gui, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen, GfxCursor *cursor)
: _event(event), _segMan(segMan), _gui(gui), _ports(ports), _paint16(paint16), _text16(text16), _screen(screen), _cursor(cursor) {
_listCount = 0;
Modified: scummvm/trunk/engines/sci/graphics/menu.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/menu.h 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/graphics/menu.h 2010-02-05 13:05:26 UTC (rev 47902)
@@ -78,7 +78,7 @@
class GfxMenu {
public:
- GfxMenu(SciEvent *event, SegManager *segMan, SciGui *gui, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen, Cursor *cursor);
+ GfxMenu(SciEvent *event, SegManager *segMan, SciGui *gui, GfxPorts *ports, GfxPaint16 *paint16, GfxText16 *text16, GfxScreen *screen, GfxCursor *cursor);
~GfxMenu();
void reset();
@@ -109,7 +109,7 @@
GfxPaint16 *_paint16;
GfxText16 *_text16;
GfxScreen *_screen;
- Cursor *_cursor;
+ GfxCursor *_cursor;
uint16 _listCount;
GuiMenuList _list;
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2010-02-05 12:57:05 UTC (rev 47901)
+++ scummvm/trunk/engines/sci/sci.cpp 2010-02-05 13:05:26 UTC (rev 47902)
@@ -156,7 +156,7 @@
GfxPalette *palette = new GfxPalette(_resMan, screen);
GfxCache *cache = new GfxCache(_resMan, screen, palette);
- Cursor *cursor = new Cursor(_resMan, palette, screen);
+ GfxCursor *cursor = new GfxCursor(_resMan, palette, screen);
// Create debugger console. It requires GFX to be initialized
_console = new Console(this);
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