aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/mars/robotship.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2011-12-16 14:17:50 -0500
committerMatthew Hoops2011-12-16 14:17:50 -0500
commit12efb47b536d2f663c9cde2739a1fd40599da669 (patch)
tree9ce08d6a798ff5138ee2908642e6468d7d2b249e /engines/pegasus/neighborhood/mars/robotship.cpp
parentfdced472abc830c07d28474727db004c8018fcac (diff)
downloadscummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.gz
scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.bz2
scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.zip
PEGASUS: Remove t prefix from typedefs
Some other minor cleanup too
Diffstat (limited to 'engines/pegasus/neighborhood/mars/robotship.cpp')
-rwxr-xr-xengines/pegasus/neighborhood/mars/robotship.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp
index 862a8b2edd..b1ecdde008 100755
--- a/engines/pegasus/neighborhood/mars/robotship.cpp
+++ b/engines/pegasus/neighborhood/mars/robotship.cpp
@@ -40,18 +40,18 @@ const TimeValue kRovingSlop = kThreeSeconds * kRovingScale;
const int kNumSpriteColumns = 15;
const int kNumSpriteRows = 16;
-const tCoordType kInitialLocationLeft = kShuttleWindowLeft - 50;
-const tCoordType kInitialLocationTop = kShuttleWindowTop - 50;
-const tCoordType kInitialLocationWidth = kShuttleWindowWidth + 100;
-const tCoordType kInitialLocationHeight = kShuttleWindowHeight + 100;
+const CoordType kInitialLocationLeft = kShuttleWindowLeft - 50;
+const CoordType kInitialLocationTop = kShuttleWindowTop - 50;
+const CoordType kInitialLocationWidth = kShuttleWindowWidth + 100;
+const CoordType kInitialLocationHeight = kShuttleWindowHeight + 100;
-const tCoordType kVelocityVectorLength = 100;
-const tCoordType kVelocityVectorSlop = 50;
+const CoordType kVelocityVectorLength = 100;
+const CoordType kVelocityVectorSlop = 50;
-const tCoordType kRovingLeft = kShuttleWindowLeft + 20;
-const tCoordType kRovingTop = kShuttleWindowTop + 20;
-const tCoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft;
-const tCoordType kRovingHeight = kShuttleWindowMidV - kRovingTop;
+const CoordType kRovingLeft = kShuttleWindowLeft + 20;
+const CoordType kRovingTop = kShuttleWindowTop + 20;
+const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft;
+const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop;
RobotShip* g_robotShip = 0;
@@ -129,7 +129,7 @@ void RobotShip::setUpNextDropTime() {
void RobotShip::timeToDropJunk() {
if (g_spaceJunk) {
- tCoordType x, y;
+ CoordType x, y;
_spritesMovie.getCenter(x, y);
g_spaceJunk->launchJunk(((PegasusEngine *)g_engine)->getRandomNumber(24), x, y);
}
@@ -169,7 +169,7 @@ void RobotShip::newDestination() {
start();
}
-void RobotShip::moveRobotTo(tCoordType x, tCoordType y) {
+void RobotShip::moveRobotTo(CoordType x, CoordType y) {
_currentLocation.x = x;
_currentLocation.y = y;
@@ -258,8 +258,8 @@ void RobotShip::timeChanged(const TimeValue) {
}
}
-void RobotShip::makeVelocityVector(tCoordType x1, tCoordType y1, tCoordType x2, tCoordType y2, Common::Point &vector) {
- tCoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength;
+void RobotShip::makeVelocityVector(CoordType x1, CoordType y1, CoordType x2, CoordType y2, Common::Point &vector) {
+ CoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength;
vector.x = x2 - x1;
vector.y = y2 - y1;
float oldLength = sqrt(vector.x * vector.x + vector.y * vector.y);