ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Typo, more concise variable names.

This commit is contained in:
Christian Speckner 2016-12-02 09:30:40 +01:00
parent a717890c29
commit a8a4545222
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emucore/tia/core_6502ts/Ball.cxx
View File

@ -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);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

8
src/emucore/tia/core_6502ts/Ball.hxx
View File

@ -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;

10
src/emucore/tia/core_6502ts/Missile.cxx
View File

@ -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;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/emucore/tia/core_6502ts/Missile.hxx
View File

@ -83,8 +83,8 @@ class Missile : public Serializable
uInt32 myCollisionMaskDisabled;
uInt32 myCollisionMaskEnabled;
bool myEnabled;
bool mySupressed;
bool myIsEnabled;
bool myIsSuppressed;
bool myEnam;
uInt8 myResmp;

6
src/emucore/tia/core_6502ts/Player.cxx
View File

@ -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;
}

2
src/emucore/tia/core_6502ts/Player.hxx
View File

@ -89,7 +89,7 @@ class Player : public Serializable
uInt32 myCollisionMaskEnabled;
uInt8 myColor;
bool mySupressed;
bool myIsSuppressed;
uInt8 myHmmClocks;
uInt8 myCounter;

6
src/emucore/tia/core_6502ts/Playfield.cxx
View File

@ -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;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/emucore/tia/core_6502ts/Playfield.hxx
View File

@ -84,7 +84,7 @@ class Playfield : public Serializable
uInt32 myCollisionMaskDisabled;
uInt32 myCollisionMaskEnabled;
bool mySupressed;
bool myIsSuppressed;
uInt8 myColorLeft;
uInt8 myColorRight;