[Scummvm-cvs-logs] SF.net SVN: scummvm:[49202] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 49202
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49202&view=rev
Author:   m_kiewitz
Date:     2010-05-24 21:47:06 +0000 (Mon, 24 May 2010)

Log Message:
-----------
SCI: renaming MacIconBar to GfxMacIconBar

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmisc.cpp
    scummvm/trunk/engines/sci/graphics/maciconbar.cpp
    scummvm/trunk/engines/sci/graphics/maciconbar.h
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/sci.cpp
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-05-24 21:47:06 UTC (rev 49202)
@@ -300,9 +300,9 @@
 
 	if (argv[0].toUint16() == 4 && argv[1].toUint16() == 0) {
 		for (int i = 0; i < argv[2].toUint16(); i++)
-			g_sci->_macIconBar->addIcon(argv[i + 3]);
+			g_sci->_gfxMacIconBar->addIcon(argv[i + 3]);
 
-		g_sci->_macIconBar->drawIcons();		
+		g_sci->_gfxMacIconBar->drawIcons();		
 	}
 
 	// Other calls seem to handle selecting/deselecting them

Modified: scummvm/trunk/engines/sci/graphics/maciconbar.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/maciconbar.cpp	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/graphics/maciconbar.cpp	2010-05-24 21:47:06 UTC (rev 49202)
@@ -36,11 +36,11 @@
 
 namespace Sci {
 
-void MacIconBar::addIcon(reg_t obj) {
+void GfxMacIconBar::addIcon(reg_t obj) {
 	_iconBarObjects.push_back(obj);
 }
 
-void MacIconBar::drawIcons() {
+void GfxMacIconBar::drawIcons() {
 	// Draw the icons to the bottom of the screen
 
 	byte *pal = new byte[256 * 4];
@@ -69,7 +69,7 @@
 	delete[] pal;
 }
 
-void MacIconBar::remapColors(Graphics::Surface *surf, byte *palette) {
+void GfxMacIconBar::remapColors(Graphics::Surface *surf, byte *palette) {
 	byte *pixels = (byte *)surf->pixels;
 
 	// Remap to the screen palette

Modified: scummvm/trunk/engines/sci/graphics/maciconbar.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/maciconbar.h	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/graphics/maciconbar.h	2010-05-24 21:47:06 UTC (rev 49202)
@@ -36,10 +36,10 @@
 
 namespace Sci {
 
-class MacIconBar {
+class GfxMacIconBar {
 public:
-	MacIconBar() {}
-	~MacIconBar() {}
+	GfxMacIconBar() {}
+	~GfxMacIconBar() {}
 
 	void addIcon(reg_t obj);
 	void drawIcons();

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-05-24 21:47:06 UTC (rev 49202)
@@ -314,8 +314,8 @@
 	_screen->setPalette(&_sysPalette);
 
 	// Redraw the Mac SCI1.1 Icon bar every palette change
-	if (g_sci->_macIconBar)
-		g_sci->_macIconBar->drawIcons();
+	if (g_sci->_gfxMacIconBar)
+		g_sci->_gfxMacIconBar->drawIcons();
 }
 
 bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) {

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-05-24 21:47:06 UTC (rev 49202)
@@ -98,7 +98,7 @@
 	DebugMan.addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game");
 
 	_gamestate = 0;
-	_macIconBar = 0;
+	_gfxMacIconBar = 0;
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 
@@ -174,7 +174,7 @@
 		screen = new GfxScreen(_resMan, 320, 200, upscaledHires);
 
 	if (_resMan->isSci11Mac() && getSciVersion() == SCI_VERSION_1_1)
-		_macIconBar = new MacIconBar();
+		_gfxMacIconBar = new GfxMacIconBar();
 
 	GfxPalette *palette = new GfxPalette(_resMan, screen);
 	GfxCache *cache = new GfxCache(_resMan, screen, palette);

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2010-05-24 20:50:53 UTC (rev 49201)
+++ scummvm/trunk/engines/sci/sci.h	2010-05-24 21:47:06 UTC (rev 49202)
@@ -65,7 +65,7 @@
 class GfxPorts;
 class GfxScreen;
 class SciGui;
-class MacIconBar;
+class GfxMacIconBar;
 
 #ifdef ENABLE_SCI32
 class SciGui32;
@@ -206,7 +206,7 @@
 	GfxPorts *_gfxPorts; // Port managment for 16-bit gfx
 	GfxScreen *_gfxScreen;
 	SciGui *_gui; /* Currently active Gui */
-	MacIconBar *_macIconBar; // Mac Icon Bar manager
+	GfxMacIconBar *_gfxMacIconBar; // Mac Icon Bar manager
 
 #ifdef ENABLE_SCI32
 	SciGui32 *_gui32; // GUI for SCI32 games


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.