diff options
| author | Paul Gilbert | 2016-07-18 18:59:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-18 18:59:10 -0400 |
| commit | 5387d4dd7b025ec3e18c4f2c17a5a82d9164e1c8 (patch) | |
| tree | 4f86317b66b144ddf34a906fcae7b6b25a3273ad /engines/titanic/star_control/star_control_sub12.cpp | |
| parent | 3ee3784073fb7c5299f553c3fd07842aed2d356f (diff) | |
| download | scummvm-rg350-5387d4dd7b025ec3e18c4f2c17a5a82d9164e1c8.tar.gz scummvm-rg350-5387d4dd7b025ec3e18c4f2c17a5a82d9164e1c8.tar.bz2 scummvm-rg350-5387d4dd7b025ec3e18c4f2c17a5a82d9164e1c8.zip | |
TITANIC: Added CStarControlSub20 copyFrom/copyTo methods
Diffstat (limited to 'engines/titanic/star_control/star_control_sub12.cpp')
| -rw-r--r-- | engines/titanic/star_control/star_control_sub12.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |