[Scummvm-git-logs] scummvm master -> 53f7e430fc0ec471824c0422c89a8021608484a5

[sev-]

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

Summary:
f71ec7aed2 DIRECTOR: Init PaletteInfo
b91cd981ef GRPAHICS: Match new[] with proper delete[]
fee81400a0 DIRECTOR: Fix Frame copy constructor
a3ee49ad25 CINE: Remove unnecessary check. uints are always >= 0
53f7e430fc CINE: Use strlcat


Commit: f71ec7aed2f53aa99ff3edc5db18088e01e6961f
    https://github.com/scummvm/scummvm/commit/f71ec7aed2f53aa99ff3edc5db18088e01e6961f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T12:14:19+02:00

Commit Message:
DIRECTOR: Init PaletteInfo

Changed paths:
    engines/director/frame.h


diff --git a/engines/director/frame.h b/engines/director/frame.h
index 51c0b0fb56..2813d82576 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -59,6 +59,14 @@ struct PaletteInfo {
 	byte delay;
 	byte style;
 	byte colorCode;
+
+	PaletteInfo() {
+		paletteId = 0;
+		firstColor = lastColor = 0;
+		flags = 0; speed = 0;
+		frameCount = cycleCount = 0;
+		fade = delay = style = colorCode = 0;
+	}
 };
 
 struct FrameEntity {


Commit: b91cd981efc9a94b477a61eb6e8145a28097b94f
    https://github.com/scummvm/scummvm/commit/b91cd981efc9a94b477a61eb6e8145a28097b94f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T12:15:11+02:00

Commit Message:
GRPAHICS: Match new[] with proper delete[]

Changed paths:
    graphics/managed_surface.cpp


diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 23452e95a4..bf166c2ced 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -519,7 +519,7 @@ void transBlit(const Surface &src, const Common::Rect &srcRect, Surface &dest, c
 		}
 	}
 
-	delete lookup;
+	delete[] lookup;
 }
 
 #define HANDLE_BLIT(SRC_BYTES, DEST_BYTES, SRC_TYPE, DEST_TYPE) \


Commit: fee81400a076be7571e899974701ecbf8b218b36
    https://github.com/scummvm/scummvm/commit/fee81400a076be7571e899974701ecbf8b218b36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T12:20:03+02:00

Commit Message:
DIRECTOR: Fix Frame copy constructor

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 90c862158d..8506c0e665 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -89,6 +89,8 @@ Frame::Frame(const Frame &frame) {
 
 	_palette = frame._palette;
 
+	_score = frame._score;
+
 	debugC(1, kDebugLoading, "Frame. action: %d transType: %d transDuration: %d", _actionId, _transType, _transDuration);
 
 	_sprites.resize(_numChannels + 1);


Commit: a3ee49ad25312da8d3e3155f244541961df43ae2
    https://github.com/scummvm/scummvm/commit/a3ee49ad25312da8d3e3155f244541961df43ae2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T12:22:18+02:00

Commit Message:
CINE: Remove unnecessary check. uints are always >= 0

Changed paths:
    engines/cine/gfx.cpp


diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index ca5bf5dac6..fb6876bc6b 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -763,7 +763,7 @@ void FWRenderer::drawFrame(bool wait) {
 	for (int i = 0; i < menus; ++i)
 		_menuStack[i]->drawMenu(*this, (i == menus - 1));
 
-	blit();	
+	blit();
 
 	if (gfxFadeInRequested) {
 		fadeFromBlack();
@@ -1403,7 +1403,7 @@ void OSRenderer::incrustMask(const BGIncrust &incrust, uint8 color) {
 }
 
 const Cine::Palette& OSRenderer::getFadeInSourcePalette() {
-	assert(_currentBg >= 0 && _currentBg <= 8);
+	assert(_currentBg <= 8);
 
 	if (_currentBg == 0) {
 		return _backupPal;


Commit: 53f7e430fc0ec471824c0422c89a8021608484a5
    https://github.com/scummvm/scummvm/commit/53f7e430fc0ec471824c0422c89a8021608484a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-27T12:24:47+02:00

Commit Message:
CINE: Use strlcat

Changed paths:
    engines/cine/anim.cpp


diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index ee6a519c0d..7499ce903c 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -832,7 +832,7 @@ int loadResource(const char *resourceName, int16 idx, int16 frameIndex) {
 		}
 
 		const char *ext = (g_sound->musicType() == MT_ADLIB) ? ".ADL" : ".HP";
-		strcat(base, ext);
+		Common::strlcat(base, ext, sizeof(base));
 		return loadResource(base, idx, frameIndex);
 	}