[Scummvm-git-logs] scummvm master -> b83677454d1b7f37623bdd0ca8fc278e765a9221

[athrxx]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da22877bad SCUMM: remove unneeded virtual declaration
b83677454d SCUMM: (HE) - fix minor tile drawing glitch


Commit: da22877bad33123e228047a3c7dcf9165ea1d0e0
    https://github.com/scummvm/scummvm/commit/da22877bad33123e228047a3c7dcf9165ea1d0e0
Author: athrxx (athrxx at scummvm.org)
Date: 2023-09-02T01:56:36+02:00

Commit Message:
SCUMM: remove unneeded virtual declaration

Changed paths:
    engines/scumm/actor.cpp
    engines/scumm/actor.h


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c205389ceb6..1f7b398793d 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1358,7 +1358,7 @@ void Actor_v7::walkActor() {
 		Actor::walkActor();
 
 	if (_moving & MF_TURN) {
-		int newDir = updateActorDirection(false);
+		int newDir = updateActorDirection();
 		if (_facing != newDir)
 			setDirection(newDir);
 		else
@@ -1490,7 +1490,7 @@ int Actor::updateActorDirection(bool is_walking) {
 	return dir;
 }
 
-int Actor_v7::updateActorDirection(bool) {
+int Actor_v7::updateActorDirection() {
 	int dirType = _vm->_costumeLoader->hasManyDirections(_costume);
 	int from = toSimpleDir(dirType, _facing);
 	int to = toSimpleDir(dirType, _targetFacing);
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 2624e17d835..88b6ffb6c14 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -212,7 +212,7 @@ protected:
 	virtual void setupActorScale();
 
 	void setBox(int box);
-	virtual int updateActorDirection(bool is_walking);
+	int updateActorDirection(bool is_walking);
 
 public:
 	void adjustActorPos();
@@ -370,7 +370,7 @@ public:
 	void startAnimActor(int frame) override;
 
 private:
-	int updateActorDirection(bool) override;
+	int updateActorDirection();
 };
 
 enum ActorV0MiscFlags {


Commit: b83677454d1b7f37623bdd0ca8fc278e765a9221
    https://github.com/scummvm/scummvm/commit/b83677454d1b7f37623bdd0ca8fc278e765a9221
Author: athrxx (athrxx at scummvm.org)
Date: 2023-09-02T01:56:46+02:00

Commit Message:
SCUMM: (HE) - fix minor tile drawing glitch

The bug would occasionally produce vertical "lines" (actually
just the background between the tiles).

Changed paths:
    engines/scumm/he/wiz_he.cpp


diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index e4b232c70d8..8857be3fa08 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -2172,7 +2172,7 @@ void Wiz::drawWizPolygonImage(uint8 *dst, const uint8 *src, const uint8 *mask, i
 		int32 w = pra->w;
 		int32 x_acc = pra->x_s;
 		int32 y_acc = pra->y_s;
-		while (--w) {
+		while (w--) {
 			int32 src_offs = (y_acc / (1 << 16)) * wizW + (x_acc / (1 << 16));
 			assert(src_offs < wizW * wizH);
 			x_acc += pra->x_step;