[Scummvm-git-logs] scummvm master -> 1dbe64b2ffb47871ed0947f1f286bafa314f9bf3

dreammaster dreammaster at scummvm.org
Fri Sep 23 02:09:29 CEST 2016


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:
1dbe64b2ff XEEN: Fix some compiler warnings


Commit: 1dbe64b2ffb47871ed0947f1f286bafa314f9bf3
    https://github.com/scummvm/scummvm/commit/1dbe64b2ffb47871ed0947f1f286bafa314f9bf3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-22T20:09:23-04:00

Commit Message:
XEEN: Fix some compiler warnings

Changed paths:
    engines/xeen/dialogs_items.cpp
    engines/xeen/dialogs_party.cpp



diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 0260ddc..be0c2da 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -718,7 +718,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
 		if (i._material < 37)
 			amount2 = Res.ELEMENTAL_DAMAGE[i._material] * 100;
 		else if (i._material > 58)
-			amount3 = Res.METAL_BASE_MULTIPLIERS[i._material - 37] * 100;
+			amount3 = Res.ELEMENTAL_DAMAGE[i._material - 59 + 7] * 100;
 		
 		switch (mode) {
 		case ITEMMODE_BLACKSMITH:
diff --git a/engines/xeen/dialogs_party.cpp b/engines/xeen/dialogs_party.cpp
index f370ac2..9457173 100644
--- a/engines/xeen/dialogs_party.cpp
+++ b/engines/xeen/dialogs_party.cpp
@@ -382,10 +382,10 @@ void PartyDialog::createChar() {
 	bool restartFlag = true;
 	uint attribs[TOTAL_ATTRIBUTES];
 	bool allowedClasses[TOTAL_CLASSES];
-	Race race;
-	Sex sex;
+	Race race = HUMAN;
+	Sex sex = MALE;
 	Common::String msg;
-	int charIndex;
+	int charIndex = 0;
 
 	Mode oldMode = _vm->_mode;
 	_vm->_mode = MODE_4;





More information about the Scummvm-git-logs mailing list