[Scummvm-git-logs] scummvm master -> 341c6a95e3e86a83d7e5e569420064bd231e2ae0

[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:
341c6a95e3 XEEN: Fix Coverity warnings


Commit: 341c6a95e3e86a83d7e5e569420064bd231e2ae0
    https://github.com/scummvm/scummvm/commit/341c6a95e3e86a83d7e5e569420064bd231e2ae0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-03T21:58:36-05:00

Commit Message:
XEEN: Fix Coverity warnings

Changed paths:
    engines/xeen/font.cpp
    engines/xeen/town.cpp


diff --git a/engines/xeen/font.cpp b/engines/xeen/font.cpp
index 2a19a77..1d7dab7 100644
--- a/engines/xeen/font.cpp
+++ b/engines/xeen/font.cpp
@@ -33,11 +33,12 @@ byte FontData::_bgColor;
 bool FontData::_fontReduced;
 Justify FontData::_fontJustify;
 
-FontSurface::FontSurface() : XSurface() {
+FontSurface::FontSurface() : XSurface(), _msgWraps(false), _displayString(nullptr) {
 	setTextColor(0);
 }
 
-FontSurface::FontSurface(int wv, int hv) : XSurface(wv, hv), _msgWraps(false), _displayString(nullptr) {
+FontSurface::FontSurface(int wv, int hv) : XSurface(wv, hv),
+		_msgWraps(false), _displayString(nullptr) {
 	create(w, h);
 	setTextColor(0);
 }
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index 2a3f58e..1d6a2b4 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -529,9 +529,9 @@ Character *Town::doTownOptions(Character *c) {
 
 Character *Town::doBankOptions(Character *c) {
 	if (_buttonValue == Common::KEYCODE_d)
-		_buttonValue = WHERE_PARTY;
+		_buttonValue = (int)WHERE_PARTY;
 	else if (_buttonValue == Common::KEYCODE_w)
-		_buttonValue = WHERE_BANK;
+		_buttonValue = (int)WHERE_BANK;
 	else
 		return c;