[Scummvm-cvs-logs] SF.net SVN: scummvm:[46293] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Dec 8 22:04:40 CET 2009
Revision: 46293
http://scummvm.svn.sourceforge.net/scummvm/?rev=46293&view=rev
Author: m_kiewitz
Date: 2009-12-08 21:04:40 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
SCI: SciGui::getPortPic now uses byref
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/gui/gui.cpp
scummvm/trunk/engines/sci/gui/gui.h
scummvm/trunk/engines/sci/gui32/gui32.cpp
scummvm/trunk/engines/sci/gui32/gui32.h
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-12-08 20:54:18 UTC (rev 46292)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-12-08 21:04:40 UTC (rev 46293)
@@ -345,7 +345,7 @@
int16 picPortTop, picPortLeft;
Common::Rect picPortRect;
if (s.isSaving())
- picPortRect = _gui->getPortPic(&picPortTop, &picPortLeft);
+ picPortRect = _gui->getPortPic(picPortTop, picPortLeft);
s.syncBytes((byte *)&picPortRect, sizeof(picPortRect));
s.syncAsSint16LE(picPortTop);
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2009-12-08 20:54:18 UTC (rev 46292)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-12-08 21:04:40 UTC (rev 46293)
@@ -126,9 +126,9 @@
};
}
-Common::Rect SciGui::getPortPic(int16 *picTop, int16 *picLeft) {
- *picTop = _windowMgr->_picWind->top;
- *picLeft = _windowMgr->_picWind->left;
+Common::Rect SciGui::getPortPic(int16 &picTop, int16 &picLeft) {
+ picTop = _windowMgr->_picWind->top;
+ picLeft = _windowMgr->_picWind->left;
return _windowMgr->_picWind->rect;
}
Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h 2009-12-08 20:54:18 UTC (rev 46292)
+++ scummvm/trunk/engines/sci/gui/gui.h 2009-12-08 21:04:40 UTC (rev 46293)
@@ -63,7 +63,7 @@
virtual void wait(int16 ticks);
virtual void setPort(uint16 portPtr);
- virtual Common::Rect getPortPic(int16 *picTop, int16 *picLeft);
+ virtual Common::Rect getPortPic(int16 &picTop, int16 &picLeft);
virtual void setPortPic(Common::Rect rect, int16 picTop, int16 picLeft, bool initPriorityBandsFlag);
virtual reg_t getPort();
virtual void globalToLocal(int16 *x, int16 *y);
Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-12-08 20:54:18 UTC (rev 46292)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp 2009-12-08 21:04:40 UTC (rev 46293)
@@ -420,11 +420,11 @@
_s->port = new_port;
}
-Common::Rect SciGui32::getPortPic(int16 *picTop, int16 *picLeft) {
+Common::Rect SciGui32::getPortPic(int16 &picTop, int16 &picLeft) {
// Don't want to fiddle around with oldgui, so we just return defaults when saving games
Common::Rect defaultRect(0, 0, 320, 200);
- *picTop = 10;
- *picLeft = 0;
+ picTop = 10;
+ picLeft = 0;
return defaultRect;
}
Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h 2009-12-08 20:54:18 UTC (rev 46292)
+++ scummvm/trunk/engines/sci/gui32/gui32.h 2009-12-08 21:04:40 UTC (rev 46293)
@@ -42,7 +42,7 @@
void wait(int16 ticks);
void setPort(uint16 portPtr);
- Common::Rect getPortPic(int16 *picTop, int16 *picLeft);
+ Common::Rect getPortPic(int16 &picTop, int16 &picLeft);
void setPortPic(Common::Rect rect, int16 picTop, int16 picLeft, bool initPriorityBandsFlag);
reg_t getPort();
void globalToLocal(int16 *x, int16 *y);
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