From a8a4545222b17c90756d28f4603b4a471405e0c6 Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Fri, 2 Dec 2016 09:30:40 +0100 Subject: [PATCH] Typo, more concise variable names. --- src/emucore/tia/core_6502ts/Ball.cxx | 18 +++++++++--------- src/emucore/tia/core_6502ts/Ball.hxx | 8 ++++---- src/emucore/tia/core_6502ts/Missile.cxx | 10 +++++----- src/emucore/tia/core_6502ts/Missile.hxx | 4 ++-- src/emucore/tia/core_6502ts/Player.cxx | 6 +++--- src/emucore/tia/core_6502ts/Player.hxx | 2 +- src/emucore/tia/core_6502ts/Playfield.cxx | 6 +++--- src/emucore/tia/core_6502ts/Playfield.hxx | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/emucore/tia/core_6502ts/Ball.cxx b/src/emucore/tia/core_6502ts/Ball.cxx index f058247ad..7cdfc0de0 100644 --- a/src/emucore/tia/core_6502ts/Ball.cxx +++ b/src/emucore/tia/core_6502ts/Ball.cxx @@ -28,7 +28,7 @@ namespace TIA6502tsCore { Ball::Ball(uInt32 collisionMask) : myCollisionMaskDisabled(collisionMask), myCollisionMaskEnabled(0xFFFF), - mySupressed(false) + myIsSuppressed(false) { reset(); } @@ -38,9 +38,9 @@ void Ball::reset() { myColor = 0; collision = myCollisionMaskDisabled; - myEnabledOld = false; - myEnabledNew = false; - myEnabled = false; + myIsEnabledOld = false; + myIsEnabledNew = false; + myIsEnabled = false; myIsDelaying = false; myHmmClocks = 0; myCounter = 0; @@ -55,7 +55,7 @@ void Ball::reset() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Ball::enabl(uInt8 value) { - myEnabledNew = (value & 0x02) > 0; + myIsEnabledNew = (value & 0x02) > 0; updateEnabled(); } @@ -98,7 +98,7 @@ void Ball::toggleCollisions(bool enabled) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Ball::toggleEnabled(bool enabled) { - mySupressed = !enabled; + myIsSuppressed = !enabled; updateEnabled(); } @@ -131,7 +131,7 @@ bool Ball::movementTick(uInt32 clock, bool apply) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Ball::render() { - collision = (myIsRendering && myRenderCounter >= 0 && myEnabled) ? + collision = (myIsRendering && myRenderCounter >= 0 && myIsEnabled) ? myCollisionMaskEnabled : myCollisionMaskDisabled; } @@ -153,14 +153,14 @@ void Ball::tick() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Ball::shuffleStatus() { - myEnabledOld = myEnabledNew; + myIsEnabledOld = myIsEnabledNew; updateEnabled(); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Ball::updateEnabled() { - myEnabled = !mySupressed && (myIsDelaying ? myEnabledOld : myEnabledNew); + myIsEnabled = !myIsSuppressed && (myIsDelaying ? myIsEnabledOld : myIsEnabledNew); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/tia/core_6502ts/Ball.hxx b/src/emucore/tia/core_6502ts/Ball.hxx index b3932360b..ad6e3cde9 100644 --- a/src/emucore/tia/core_6502ts/Ball.hxx +++ b/src/emucore/tia/core_6502ts/Ball.hxx @@ -87,10 +87,10 @@ class Ball : public Serializable uInt8 myColor; - bool myEnabledOld; - bool myEnabledNew; - bool myEnabled; - bool mySupressed; + bool myIsEnabledOld; + bool myIsEnabledNew; + bool myIsEnabled; + bool myIsSuppressed; bool myIsDelaying; uInt8 myHmmClocks; diff --git a/src/emucore/tia/core_6502ts/Missile.cxx b/src/emucore/tia/core_6502ts/Missile.cxx index 658b32f17..df2393f14 100644 --- a/src/emucore/tia/core_6502ts/Missile.cxx +++ b/src/emucore/tia/core_6502ts/Missile.cxx @@ -30,7 +30,7 @@ namespace TIA6502tsCore { Missile::Missile(uInt32 collisionMask) : myCollisionMaskDisabled(collisionMask), myCollisionMaskEnabled(0xFFFF), - mySupressed(false) + myIsSuppressed(false) { reset(); } @@ -39,7 +39,7 @@ Missile::Missile(uInt32 collisionMask) void Missile::reset() { myDecodes = DrawCounterDecodes::get().missileDecodes()[0]; - myEnabled = false; + myIsEnabled = false; myEnam = false; myResmp = 0; myHmmClocks = 0; @@ -96,7 +96,7 @@ void Missile::toggleCollisions(bool enabled) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Missile::toggleEnabled(bool enabled) { - mySupressed = !enabled; + myIsSuppressed = !enabled; updateEnabled(); } @@ -134,7 +134,7 @@ bool Missile::movementTick(uInt32 clock, bool apply) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Missile::render() { - collision = (myIsRendering && myRenderCounter >= 0 && myEnabled) ? + collision = (myIsRendering && myRenderCounter >= 0 && myIsEnabled) ? myCollisionMaskEnabled : myCollisionMaskDisabled; } @@ -161,7 +161,7 @@ void Missile::setColor(uInt8 color) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Missile::updateEnabled() { - myEnabled = !mySupressed && myEnam && !myResmp; + myIsEnabled = !myIsSuppressed && myEnam && !myResmp; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/tia/core_6502ts/Missile.hxx b/src/emucore/tia/core_6502ts/Missile.hxx index 67abb55ca..4002ca4d6 100644 --- a/src/emucore/tia/core_6502ts/Missile.hxx +++ b/src/emucore/tia/core_6502ts/Missile.hxx @@ -83,8 +83,8 @@ class Missile : public Serializable uInt32 myCollisionMaskDisabled; uInt32 myCollisionMaskEnabled; - bool myEnabled; - bool mySupressed; + bool myIsEnabled; + bool myIsSuppressed; bool myEnam; uInt8 myResmp; diff --git a/src/emucore/tia/core_6502ts/Player.cxx b/src/emucore/tia/core_6502ts/Player.cxx index 975e52ff6..648f3cc44 100644 --- a/src/emucore/tia/core_6502ts/Player.cxx +++ b/src/emucore/tia/core_6502ts/Player.cxx @@ -30,7 +30,7 @@ namespace TIA6502tsCore { Player::Player(uInt32 collisionMask) : myCollisionMaskDisabled(collisionMask), myCollisionMaskEnabled(0xFFFF), - mySupressed(false) + myIsSuppressed(false) { reset(); } @@ -119,7 +119,7 @@ void Player::vdelp(uInt8 value) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Player::toggleEnabled(bool enabled) { - mySupressed = !enabled; + myIsSuppressed = !enabled; updatePattern(); } @@ -211,7 +211,7 @@ uInt8 Player::getRespClock() const // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Player::updatePattern() { - if (mySupressed) { + if (myIsSuppressed) { myPattern = 0; return; } diff --git a/src/emucore/tia/core_6502ts/Player.hxx b/src/emucore/tia/core_6502ts/Player.hxx index ca38c637a..164c2a3d6 100644 --- a/src/emucore/tia/core_6502ts/Player.hxx +++ b/src/emucore/tia/core_6502ts/Player.hxx @@ -89,7 +89,7 @@ class Player : public Serializable uInt32 myCollisionMaskEnabled; uInt8 myColor; - bool mySupressed; + bool myIsSuppressed; uInt8 myHmmClocks; uInt8 myCounter; diff --git a/src/emucore/tia/core_6502ts/Playfield.cxx b/src/emucore/tia/core_6502ts/Playfield.cxx index e89dc589e..7aa1f614a 100644 --- a/src/emucore/tia/core_6502ts/Playfield.cxx +++ b/src/emucore/tia/core_6502ts/Playfield.cxx @@ -25,7 +25,7 @@ namespace TIA6502tsCore { Playfield::Playfield(uInt32 collisionMask) : myCollisionMaskDisabled(collisionMask), myCollisionMaskEnabled(0xFFFF), - mySupressed(false) + myIsSuppressed(false) { reset(); } @@ -95,7 +95,7 @@ void Playfield::ctrlpf(uInt8 value) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Playfield::toggleEnabled(bool enabled) { - mySupressed = !enabled; + myIsSuppressed = !enabled; updatePattern(); } @@ -170,7 +170,7 @@ void Playfield::applyColors() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Playfield::updatePattern() { - myEffectivePattern = mySupressed ? 0 : myPattern; + myEffectivePattern = myIsSuppressed ? 0 : myPattern; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/tia/core_6502ts/Playfield.hxx b/src/emucore/tia/core_6502ts/Playfield.hxx index e8efd3f4b..000e6240f 100644 --- a/src/emucore/tia/core_6502ts/Playfield.hxx +++ b/src/emucore/tia/core_6502ts/Playfield.hxx @@ -84,7 +84,7 @@ class Playfield : public Serializable uInt32 myCollisionMaskDisabled; uInt32 myCollisionMaskEnabled; - bool mySupressed; + bool myIsSuppressed; uInt8 myColorLeft; uInt8 myColorRight;