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

mduggan mgithub at guarana.org
Mon Jun 29 05:19:40 UTC 2020


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:
d6ced4ef13 ULTIMA8: Fix coverity issue of uninitialized member


Commit: d6ced4ef136f17137511fd6dc471086778a9975f
    https://github.com/scummvm/scummvm/commit/d6ced4ef136f17137511fd6dc471086778a9975f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-29T14:19:26+09:00

Commit Message:
ULTIMA8: Fix coverity issue of uninitialized member

Changed paths:
    engines/ultima/ultima8/gumps/computer_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/computer_gump.cpp b/engines/ultima/ultima8/gumps/computer_gump.cpp
index 25f7f99485..ff7a10c0fb 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/computer_gump.cpp
@@ -46,12 +46,12 @@ static const int COMPUTER_GUMP_SHAPE = 30;
 static const int COMPUTER_GUMP_SOUND = 0x33;
 
 ComputerGump::ComputerGump()
-	: ModalGump() {
+	: ModalGump(), _textWidget(nullptr) {
 
 }
 
 ComputerGump::ComputerGump(const Std::string &msg) :
-	ModalGump(0, 0, 100, 100), _text(msg) {
+	ModalGump(0, 0, 100, 100), _text(msg), _textWidget(nullptr) {
 }
 
 ComputerGump::~ComputerGump(void) {
@@ -86,7 +86,7 @@ void ComputerGump::InitGump(Gump *newparent, bool take_focus) {
 	botGump->SetShape(shape, 1);
 	botGump->InitGump(this, false);
 
-	_textWidget = new TextWidget(42, 42, _text, true, COMPUTER_FONT, _dims.w - 42 * 2, 0, Font::TEXT_LEFT);
+	_textWidget = new TextWidget(41, 38, _text, true, COMPUTER_FONT, _dims.w - 100, 0, Font::TEXT_LEFT);
 	_textWidget->InitGump(this);
 
 	AudioProcess *audio = AudioProcess::get_instance();




More information about the Scummvm-git-logs mailing list