From 5387d4dd7b025ec3e18c4f2c17a5a82d9164e1c8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 18 Jul 2016 18:59:10 -0400
Subject: TITANIC: Added CStarControlSub20 copyFrom/copyTo methods

---
 engines/titanic/star_control/star_control_sub12.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/titanic/star_control/star_control_sub12.cpp')

diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index 85b7c83878..5840495d34 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -29,10 +29,10 @@ namespace Titanic {
 FMatrix *CStarControlSub12::_matrix1;
 FMatrix *CStarControlSub12::_matrix2;
 
-CStarControlSub12::CStarControlSub12(void *val1, void *val2) : 
+CStarControlSub12::CStarControlSub12(void *val1, const CStar20Data *data) : 
 		_currentIndex(-1), _handlerP(nullptr), _field108(0),
 		_sub13(val1) {
-	setupHandler(val2);
+	setupHandler(data);
 }
 
 CStarControlSub12::CStarControlSub12(CStarControlSub13 *src) :
@@ -59,8 +59,8 @@ void CStarControlSub12::proc2(const void *src) {
 	_sub13.copyFrom(src); 
 }
 
-void CStarControlSub12::proc3(const void *src) {
-	_handlerP->copyFrom1(src);
+void CStarControlSub12::proc3(const CStar20Data *src) {
+	_handlerP->copyFrom(src);
 }
 
 void CStarControlSub12::setPosition(const FVector &v) {
@@ -246,7 +246,7 @@ void CStarControlSub12::save(SimpleFile *file, int indent) {
 	_sub13.save(file, indent);
 }
 
-bool CStarControlSub12::setupHandler(void *src) {
+bool CStarControlSub12::setupHandler(const CStar20Data *src) {
 	CStarControlSub20 *handler = nullptr;
 
 	switch (_currentIndex) {
-- 
cgit v1.2.3