[Scummvm-git-logs] scummvm master -> 4b329b72652552d7e88a0dc9b6a135b4532a779b
Strangerke
noreply at scummvm.org
Fri Jul 28 08:37:40 UTC 2023
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:
4b329b7265 AVALANCHE: Fix some issues reported by pvs-studio
Commit: 4b329b72652552d7e88a0dc9b6a135b4532a779b
https://github.com/scummvm/scummvm/commit/4b329b72652552d7e88a0dc9b6a135b4532a779b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-07-28T09:37:26+01:00
Commit Message:
AVALANCHE: Fix some issues reported by pvs-studio
Changed paths:
engines/avalanche/avalanche.cpp
engines/avalanche/avalanche.h
engines/avalanche/avalot.cpp
engines/avalanche/background.cpp
engines/avalanche/dialogs.cpp
engines/avalanche/dropdown.cpp
engines/avalanche/ghostroom.cpp
engines/avalanche/graphics.cpp
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 3cb1d56cc44..9851a7ec00b 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -34,7 +34,6 @@
namespace Avalanche {
AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *gd) : Engine(syst), _gameDescription(gd), _fxHidden(false), _interrogation(0) {
- _system = syst;
setDebugger(new AvalancheConsole(this));
_rnd = new Common::RandomSource("avalanche");
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 416305e202f..a6e9e34d603 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -91,8 +91,6 @@ public:
Help *_help;
HighScore *_highscore;
- OSystem *_system;
-
AvalancheEngine(OSystem *syst, const AvalancheGameDescription *gd);
~AvalancheEngine() override;
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 53666bbe948..3673c485d86 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -808,7 +808,9 @@ void AvalancheEngine::enterRoom(Room roomId, byte ped) {
break;
case kRoomOutsideNottsPub:
+ case kRoomOutsideDucks:
if (ped == 2) {
+ // Shut the door
_background->draw(-1, -1, 2);
_graphics->refreshBackground();
_sequence->startDuckSeq();
@@ -908,15 +910,6 @@ void AvalancheEngine::enterRoom(Room roomId, byte ped) {
_npcFacing = 1; // Port.
break;
- case kRoomOutsideDucks:
- if (ped == 2) {
- // Shut the door
- _background->draw(-1, -1, 2);
- _graphics->refreshBackground();
- _sequence->startDuckSeq();
- }
- break;
-
case kRoomDucks:
_npcFacing = 1; // Duck.
break;
@@ -1506,7 +1499,7 @@ Common::String AvalancheEngine::getName(People whose) {
"Spurge", "Jacques"
};
- static const char lasses[4][15] = {"Arkata", "Geida", "\0xB1", "the Wise Woman"};
+ static const char lasses[4][15] = {"Arkata", "Geida", "\xB1", "the Wise Woman"};
if (whose <= kPeopleJacques)
return Common::String(lads[whose - kPeopleAvalot]);
diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index 218fd2c81b4..e8b5a0716c4 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -37,6 +37,9 @@ Background::Background(AvalancheEngine *vm) {
_vm = vm;
_spriteNum = 0;
_nextBell = 0;
+
+ for (int i = 0; i < 40; ++i)
+ _offsets[i] = 0;
}
Background::~Background() {
@@ -156,9 +159,9 @@ void Background::update() {
// Bearing of Avvy from du Lustie.
else if ((angle <= 45) || ((angle >= 315) && (angle <= 360)))
direction = 1; // Middle.
- else if ((angle >= 45) && (angle <= 180))
+ else if (angle <= 180)
direction = 2; // Left.
- else if ((angle >= 181) && (angle <= 314))
+ else if (angle <= 314)
direction = 3; // Right.
if (direction != _vm->_npcFacing) { // du Lustie.
@@ -201,9 +204,9 @@ void Background::update() {
uint16 angle = _vm->bearing(4);
if ((angle <= 45) || ((angle >= 315) && (angle <= 360)))
direction = 2; // Middle.
- else if ((angle >= 45) && (angle <= 180))
+ else if (angle <= 180)
direction = 6; // Left.
- else if ((angle >= 181) && (angle <= 314))
+ else if (angle <= 314)
direction = 8; // Right.
if ((_vm->_roomCycles % 60) > 57)
@@ -235,9 +238,9 @@ void Background::update() {
uint16 angle = _vm->bearing(1);
if ((angle <= 45) || ((angle >= 315) && (angle <= 360)))
direction = 4; // Middle.
- else if ((angle >= 45) && (angle <= 180))
+ else if (angle <= 180)
direction = 6; // Left.
- else if ((angle >= 181) && (angle <= 314))
+ else if (angle <= 314)
direction = 8; // Right.
if ((_vm->_roomCycles % 45) > 42)
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index 7d51610491a..1ec5f648116 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -706,7 +706,7 @@ void Dialogs::displayText(Common::String text) {
if (_param == 0)
setBubbleStateNatural();
- else if ((1 <= _param) && (_param <= 9)) {
+ else if (_param <= 9) {
assert(_param - 1 < _vm->_animation->kSpriteNumbMax);
AnimationType *spr = _vm->_animation->_sprites[_param - 1];
if ((_param > _vm->_animation->kSpriteNumbMax) || (!spr->_quick)) { // Not valid.
@@ -714,7 +714,7 @@ void Dialogs::displayText(Common::String text) {
setBubbleStateNatural();
} else
spr->chatter(); // Normal sprite talking routine.
- } else if ((10 <= _param) && (_param <= 36)) {
+ } else if (_param <= 36) {
// Quasi-peds. (This routine performs the same
// thing with QPs as triptype.chatter does with the
// sprites.)
diff --git a/engines/avalanche/dropdown.cpp b/engines/avalanche/dropdown.cpp
index a7824a26069..74569017b2c 100644
--- a/engines/avalanche/dropdown.cpp
+++ b/engines/avalanche/dropdown.cpp
@@ -280,6 +280,7 @@ void DropDownMenu::findWhatYouCanDoWithIt() {
case kObjectBell:
_verbStr = Common::String(kVerbCodeExam) + kVerbCodeRing;
break;
+ case kObjectClothes:
case kObjectChastity:
_verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
break;
@@ -290,9 +291,6 @@ void DropDownMenu::findWhatYouCanDoWithIt() {
case kObjectOnion:
_verbStr = Common::String(kVerbCodeExam) + kVerbCodeEat;
break;
- case kObjectClothes:
- _verbStr = Common::String(kVerbCodeExam) + kVerbCodeWear;
- break;
default:
_verbStr = kVerbCodeExam; // Anything else.
}
@@ -309,11 +307,7 @@ void DropDownMenu::drawMenuText(int16 x, int16 y, char trigger, Common::String t
backgroundColor = kColorLightgray;
}
- byte ander;
- if (valid)
- ander = 255;
- else
- ander = 170;
+ byte ander = valid ? 255 : 170;
FontType font;
for (uint i = 0; i < text.size(); i++) {
@@ -705,7 +699,7 @@ void DropDownMenu::update() {
if ((0 <= cursorPos.y) && (cursorPos.y <= 21))
_vm->_graphics->loadMouse(kCurUpArrow); // Up arrow
else if ((22 <= cursorPos.y) && (cursorPos.y <= 339)) {
- if ((cursorPos.x >= _activeMenuItem._flx1 * 8) && (cursorPos.x <= _activeMenuItem._flx2 * 8) && (cursorPos.y > 21) && (cursorPos.y <= _activeMenuItem._fly * 2 + 1))
+ if ((cursorPos.x >= _activeMenuItem._flx1 * 8) && (cursorPos.x <= _activeMenuItem._flx2 * 8) && (cursorPos.y <= _activeMenuItem._fly * 2 + 1))
_vm->_graphics->loadMouse(kCurRightArrow); // Right-arrow
else
_vm->_graphics->loadMouse(kCurFletch); // Fletch
@@ -795,7 +789,7 @@ char DropDownMenu::getThingChar(byte which) {
byte DropDownMenu::getNameChar(People whose) {
static const char ladChar[] = "ASCDMTRwLfgeIyPu";
- static const char lassChar[] = "kG\0xB1o";
+ static const char lassChar[] = "kG\xB1o";
if (whose <= kPeopleJacques)
return ladChar[whose - kPeopleAvalot];
diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp
index 48353f8b0f7..d269cc36692 100644
--- a/engines/avalanche/ghostroom.cpp
+++ b/engines/avalanche/ghostroom.cpp
@@ -130,7 +130,7 @@ void GhostRoom::doBat() {
batImage = 2;
}
- if ((_batCount == 91) || (_batCount == 241)) // When the bat changes, blank out the old one.
+ if (batImage && (_batCount == 91 || _batCount == 241)) // When the bat changes, blank out the old one.
_vm->_graphics->drawFilledRectangle(Common::Rect(_batX + _bat[batImage].w, _batY, _batX + _bat[batImage - 1].w, _batY + _bat[batImage - 1].h), kColorBlack);
_vm->_graphics->drawFilledRectangle(Common::Rect(_batX, _batY, _batX + _bat[batImage].w, _batY + iy), kColorBlack);
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index f8e1ec3540b..ba44005ca7f 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -1034,7 +1034,7 @@ void GraphicManager::drawSprite(AnimationType *sprite, byte picnum, int16 x, int
for (int j = 0; j < sprite->_yLength; j++) {
for (int i = 0; i < sprite->_xLength; i++) {
if ((x + i < _surface.w) && (y + j < _surface.h)) {
- if (((*sprite->_sil[picnum])[j][i / 8] >> ((7 - i % 8)) & 1) == 0)
+ if (((*sprite->_sil[picnum])[j][i / 8] >> (7 - (i % 8)) & 1) == 0)
*(byte *)_surface.getBasePtr(x + i, y + j) = 0;
}
}
More information about the Scummvm-git-logs
mailing list