[Scummvm-git-logs] scummvm master -> 4940bef43edfd37bc57c901e46879cf69d36b37e
dreammaster
dreammaster at scummvm.org
Mon Apr 17 17:50:22 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4940bef43e TITANIC: Further renamings of CStarMover fields
Commit: 4940bef43edfd37bc57c901e46879cf69d36b37e
https://github.com/scummvm/scummvm/commit/4940bef43edfd37bc57c901e46879cf69d36b37e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-17T11:50:12-04:00
Commit Message:
TITANIC: Further renamings of CStarMover fields
Changed paths:
engines/titanic/star_control/camera_mover.cpp
engines/titanic/star_control/camera_mover.h
diff --git a/engines/titanic/star_control/camera_mover.cpp b/engines/titanic/star_control/camera_mover.cpp
index 07072af..bd588e6 100644
--- a/engines/titanic/star_control/camera_mover.cpp
+++ b/engines/titanic/star_control/camera_mover.cpp
@@ -35,11 +35,11 @@ CCameraMover::CCameraMover(const CNavigationInfo *src) {
_speed = 0.0;
_speedChangeCtr = 0.0;
_speedChangeInc = 20.0;
- _fieldC = 0.0;
+ _unused = 0.0;
_maxSpeed = 50000.0;
- _field14 = 1.0;
- _field18 = 1.0;
- _field1C = 0.0;
+ _unusedX = 1.0;
+ _unusedY = 1.0;
+ _unusedZ = 0.0;
}
}
@@ -117,11 +117,11 @@ void CCameraMover::load(SimpleFile *file, int val) {
_speed = file->readFloat();
_speedChangeCtr = file->readFloat();
_speedChangeInc = file->readFloat();
- _fieldC = file->readFloat();
+ _unused = file->readFloat();
_maxSpeed = file->readFloat();
- _field14 = file->readFloat();
- _field18 = file->readFloat();
- _field1C = file->readFloat();
+ _unusedX = file->readFloat();
+ _unusedY = file->readFloat();
+ _unusedZ = file->readFloat();
}
}
@@ -129,11 +129,11 @@ void CCameraMover::save(SimpleFile *file, int indent) {
file->writeFloatLine(_speed, indent);
file->writeFloatLine(_speedChangeCtr, indent);
file->writeFloatLine(_speedChangeInc, indent);
- file->writeFloatLine(_fieldC, indent);
+ file->writeFloatLine(_unused, indent);
file->writeFloatLine(_maxSpeed, indent);
- file->writeFloatLine(_field14, indent);
- file->writeFloatLine(_field18, indent);
- file->writeFloatLine(_field1C, indent);
+ file->writeFloatLine(_unusedX, indent);
+ file->writeFloatLine(_unusedY, indent);
+ file->writeFloatLine(_unusedZ, indent);
}
void CCameraMover::incLockCount() {
diff --git a/engines/titanic/star_control/camera_mover.h b/engines/titanic/star_control/camera_mover.h
index 30fe6ff..c3528f8 100644
--- a/engines/titanic/star_control/camera_mover.h
+++ b/engines/titanic/star_control/camera_mover.h
@@ -34,11 +34,11 @@ struct CNavigationInfo {
double _speed;
double _speedChangeCtr;
double _speedChangeInc;
- double _fieldC;
+ double _unused;
double _maxSpeed;
- double _field14;
- double _field18;
- double _field1C;
+ double _unusedX;
+ double _unusedY;
+ double _unusedZ;
};
class CCameraMover : public CNavigationInfo {
More information about the Scummvm-git-logs
mailing list