[Scummvm-git-logs] scummvm master -> 44f5bed2484fa2435600a3e2f95b54c63550bc6d

[dreammaster]

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:
44f5bed248 ULTIMA8: Fixing uninitialized field warnings


Commit: 44f5bed2484fa2435600a3e2f95b54c63550bc6d
    https://github.com/scummvm/scummvm/commit/44f5bed2484fa2435600a3e2f95b54c63550bc6d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-09T21:40:37-08:00

Commit Message:
ULTIMA8: Fixing uninitialized field warnings

Changed paths:
    engines/ultima/ultima8/audio/audio_channel.cpp
    engines/ultima/ultima8/graphics/scaler.h
    engines/ultima/ultima8/gumps/widgets/text_widget.cpp


diff --git a/engines/ultima/ultima8/audio/audio_channel.cpp b/engines/ultima/ultima8/audio/audio_channel.cpp
index 35d0154..0793d96 100644
--- a/engines/ultima/ultima8/audio/audio_channel.cpp
+++ b/engines/ultima/ultima8/audio/audio_channel.cpp
@@ -43,7 +43,7 @@ namespace Ultima8 {
 
 AudioChannel::AudioChannel(Audio::Mixer *mixer, uint32 sampleRate, bool stereo) :
 		_mixer(mixer), _decompressorSize(0), _frameSize(0), _loop(0), _sample(0),
-		_frameEvenOdd(0), _paused(false) {
+		_frameEvenOdd(0), _paused(false), _priority(0) {
 }
 
 AudioChannel::~AudioChannel(void) {
diff --git a/engines/ultima/ultima8/graphics/scaler.h b/engines/ultima/ultima8/graphics/scaler.h
index 4747406..7864c67 100644
--- a/engines/ultima/ultima8/graphics/scaler.h
+++ b/engines/ultima/ultima8/graphics/scaler.h
@@ -48,7 +48,8 @@ protected:
 	ScalerFunc  Scale32_A888;
 	ScalerFunc  Scale32_888A;
 
-	Scaler() {}
+	Scaler() : Scale16Nat(0), Scale16Sta(0), Scale32Nat(0), Scale32Sta(0),
+		Scale32_A888(0), Scale32_888A(0) {}
 public:
 	//
 	// Scaler Capabilites
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index 4a265af..a65d09e 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -38,9 +38,9 @@ namespace Ultima8 {
 
 DEFINE_RUNTIME_CLASSTYPE_CODE(TextWidget, Gump)
 
-TextWidget::TextWidget()
-	: Gump(), cached_text(0) {
-
+TextWidget::TextWidget() : Gump(), gamefont(false), fontnum(0), blendColour(0),
+		tx(0), ty(0), current_start(0), current_end(0), targetwidth(0), targetheight(0),
+		cached_text(0), textalign(Font::TEXT_LEFT) {
 }
 
 TextWidget::TextWidget(int X, int Y, Std::string txt, bool gamefont_, int font,
@@ -48,7 +48,6 @@ TextWidget::TextWidget(int X, int Y, Std::string txt, bool gamefont_, int font,
 	Gump(X, Y, w, h), text(txt), gamefont(gamefont_), fontnum(font),
 	blendColour(0), current_start(0), current_end(0),
 	targetwidth(w), targetheight(h), cached_text(0), textalign(align) {
-
 }
 
 TextWidget::~TextWidget(void) {