SCI: SciGui::getPortPic now uses byref

svn-id: r46293

5 files changed, 9 insertions, 9 deletions

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index fb4e658b54..f6ce7da4b7 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -345,7 +345,7 @@ void EngineState::saveLoadWithSerializer(Common::Serializer &s) {
 		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);
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index ef6fc92bbc..be1ca1ca47 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -126,9 +126,9 @@ void SciGui::setPort(uint16 portPtr) {
 	};
 }
 
-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;
 }
 
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 006fa1189d..4d51efd95e 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -63,7 +63,7 @@ public:
 
 	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);
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index acfcc65377..60594e6f15 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -420,11 +420,11 @@ void SciGui32::setPort(uint16 portPtr) {
 	_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;
 }
 
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index 48d1b7fb5c..7646d0c026 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -42,7 +42,7 @@ public:
 
 	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);