libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 09:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AVALANCHE: Remove various dead variables and associated code

Browse Source
This commit is contained in:
Strangerke 2013-09-30 22:00:05 +02:00
parent b160a156c1
commit 98b5fe757f
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/avalanche/animation.cpp
View File

@ -1091,7 +1091,7 @@ void Animation::drawSprites() {
* @remarks Originally called 'trippancy_link'
*/
void Animation::animLink() {
if (_vm->_menu->isActive() | _vm->_onToolbar | _vm->_seeScroll)
if (_vm->_menu->isActive() | _vm->_seeScroll)
return;
for (int16 i = 0; i < kSpriteNumbMax; i++) {
if (_sprites[i]._quick && _sprites[i]._visible)

1
engines/avalanche/avalanche.cpp
View File

@ -388,7 +388,6 @@ bool AvalancheEngine::loadGame(const int16 slot) {
refreshObjectList();
_animation->updateSpeed();
drawDirection();
_onToolbar = false;
_animation->animLink();
_background->update();

7
engines/avalanche/avalanche.h
View File

@ -162,9 +162,6 @@ private:
#endif
public:
static const int16 kXW = 30;
static const int16 kYW = 36; // x width & y whatsit
static const int16 kMargin = 5;
static const MouseHotspotType kMouseHotSpots[9];
static const int16 kMaxSprites = 2; // Current max no. of sprites.
@ -184,8 +181,6 @@ public:
};
// These following static constants should be included in CFG when it's written.
static const bool kSlowComputer = false; // Stops walking when mouse touches toolbar.
static const int16 kBorder = 1; // size of border on shadowboxes
static const int16 kWalk = 3;
static const int16 kRun = 5;
@ -282,7 +277,7 @@ public:
int16 _talkX, _talkY;
Color _talkBackgroundColor, _talkFontColor;
byte _scrollBells; // no. of times to ring the bell
bool _onToolbar, _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
bool _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
char _objectList[10];
// Called .free() for them in ~Gyro().
int8 _scoreToDisplay[3];

2
engines/avalanche/avalot.cpp
View File

@ -1243,7 +1243,6 @@ void AvalancheEngine::guideAvvy(Common::Point cursorPos) {
void AvalancheEngine::checkClick() {
Common::Point cursorPos = getMousePos();
_onToolbar = kSlowComputer && ((cursorPos.y >= 169) || (cursorPos.y <= 10));
/*if (mrelease > 0)
after_the_scroll = false;*/
@ -1523,7 +1522,6 @@ void AvalancheEngine::newGame() {
_thinkThing = true;
_thinks = 2;
refreshObjectList();
_onToolbar = false;
_seeScroll = false;
avvy->appear(300, 117, kDirRight); // Needed to initialize Avalot.