diff options
author | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
commit | dead4aa01446da2bf711e64a4e681be460fa1202 (patch) | |
tree | 149648f240e839900e18af10953c4408da1e9464 /engines/titanic/star_control | |
parent | c5efd9f7487f4f51316d9ae6e6cbef3d35dd7b51 (diff) | |
download | scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.gz scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.bz2 scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.zip |
JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r-- | engines/titanic/star_control/star_control.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub12.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub13.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub20.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub25.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field.h | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/surface_fader_base.cpp | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index 7ba160cd37..01318db774 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -58,7 +58,7 @@ void CStarControl::save(SimpleFile *file, int indent) { void CStarControl::load(SimpleFile *file) { int val = file->readNumber(); - + if (!val) { _starField.load(file); if (!_starField.initDocument()) @@ -74,7 +74,7 @@ void CStarControl::load(SimpleFile *file) { _fieldBC = 1; } - + CGameObject::load(file); } diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp index 5840495d34..e8d49992bb 100644 --- a/engines/titanic/star_control/star_control_sub12.cpp +++ b/engines/titanic/star_control/star_control_sub12.cpp @@ -29,7 +29,7 @@ namespace Titanic { FMatrix *CStarControlSub12::_matrix1; FMatrix *CStarControlSub12::_matrix2; -CStarControlSub12::CStarControlSub12(void *val1, const CStar20Data *data) : +CStarControlSub12::CStarControlSub12(void *val1, const CStar20Data *data) : _currentIndex(-1), _handlerP(nullptr), _field108(0), _sub13(val1) { setupHandler(data); @@ -56,7 +56,7 @@ CStarControlSub12::~CStarControlSub12() { } void CStarControlSub12::proc2(const void *src) { - _sub13.copyFrom(src); + _sub13.copyFrom(src); } void CStarControlSub12::proc3(const CStar20Data *src) { diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp index cc9e239194..490e6d0630 100644 --- a/engines/titanic/star_control/star_control_sub13.cpp +++ b/engines/titanic/star_control/star_control_sub13.cpp @@ -91,12 +91,12 @@ void CStarControlSub13::load(SimpleFile *file, int param) { _field14 = file->readFloat(); _field18 = file->readFloat(); _field1C = file->readFloat(); - + int widthHeight = file->readNumber(); _width = widthHeight & 0xff; _height = _width >> 16; _field24 = file->readNumber(); - + for (int idx = 0; idx < 5; ++idx) _valArray[idx] = file->readFloat(); diff --git a/engines/titanic/star_control/star_control_sub20.cpp b/engines/titanic/star_control/star_control_sub20.cpp index 5c6c243eaa..cc1029896a 100644 --- a/engines/titanic/star_control/star_control_sub20.cpp +++ b/engines/titanic/star_control/star_control_sub20.cpp @@ -43,7 +43,7 @@ CStarControlSub20::CStarControlSub20(const CStar20Data *src) { } } -CStarControlSub20::~CStarControlSub20() { +CStarControlSub20::~CStarControlSub20() { clear(); } diff --git a/engines/titanic/star_control/star_control_sub25.h b/engines/titanic/star_control/star_control_sub25.h index e943782e37..b61569c49d 100644 --- a/engines/titanic/star_control/star_control_sub25.h +++ b/engines/titanic/star_control/star_control_sub25.h @@ -35,7 +35,7 @@ public: CStarControlSub26 _sub1; CStarControlSub26 _sub2; public: - + }; } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp index c50e8466ec..0dbc5fd700 100644 --- a/engines/titanic/star_control/star_field.cpp +++ b/engines/titanic/star_control/star_field.cpp @@ -69,7 +69,7 @@ void CStarField::render(CVideoSurface *surface, CStarControlSub12 *sub12) { // TODO } -int CStarField::get1() const { +int CStarField::get1() const { return _val1; } @@ -102,7 +102,7 @@ void CStarField::set3(int val) { } void CStarField::toggle4() { - _val4 = !_val4; + _val4 = !_val4; } bool CStarField::set4(bool val) { diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h index ef1ee29737..91cefbb457 100644 --- a/engines/titanic/star_control/star_field.h +++ b/engines/titanic/star_control/star_field.h @@ -73,12 +73,12 @@ public: void set54(int val); int get3() const; void set3(int val); - void toggle4(); + void toggle4(); bool set4(bool val); int get88() const; int get5() const; void update6(); - int get6() const; + int get6() const; }; } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index f5d1d36c49..437c0f0e52 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -29,7 +29,7 @@ namespace Titanic { CStarView::CStarView() : _sub12(nullptr, nullptr), _sub13((void *)nullptr), - _owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0), + _owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0), _videoSurface2(nullptr), _field210(0), _homePhotoMask(nullptr), _field218(0), _field21C(0) { CStar20Data data = { 0, 0, 0x47C35000, 0, 0x41A00000, @@ -53,7 +53,7 @@ void CStarView::load(SimpleFile *file, int param) { void CStarView::save(SimpleFile *file, int indent) { _sub12.save(file, indent); - + file->writeNumberLine(_field118, indent); if (_field118) _sub13.save(file, indent); diff --git a/engines/titanic/star_control/surface_fader_base.cpp b/engines/titanic/star_control/surface_fader_base.cpp index dfd7c4ab1d..fb17fb1f31 100644 --- a/engines/titanic/star_control/surface_fader_base.cpp +++ b/engines/titanic/star_control/surface_fader_base.cpp @@ -70,7 +70,7 @@ CVideoSurface *CSurfaceFaderBase::fade(CScreenManager *screenManager, CVideoSurf srcSurface->unlock(); _videoSurface->unlock(); - + ++_index; return _videoSurface; } |