[Scummvm-git-logs] scummvm master -> 7296f24ef8c5e1736db37dc68bc6bc05d3f207aa

[dreammaster]

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

Summary:
d3420988e5 ULTIMA4: Janitorial for switch idioms
7296f24ef8 ULTIMA4: Redraw stats after full stats cheat action


Commit: d3420988e58840941a228ee86e20c66fcc3b481d
    https://github.com/scummvm/scummvm/commit/d3420988e58840941a228ee86e20c66fcc3b481d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-14T19:42:26-07:00

Commit Message:
ULTIMA4: Janitorial for switch idioms

Changed paths:
    engines/ultima/ultima4/controllers/combat_controller.cpp
    engines/ultima/ultima4/core/debugger.cpp
    engines/ultima/ultima4/core/debugger_actions.cpp
    engines/ultima/ultima4/game/creature.cpp
    engines/ultima/ultima4/game/player.cpp
    engines/ultima/ultima4/gfx/imageloader.cpp


diff --git a/engines/ultima/ultima4/controllers/combat_controller.cpp b/engines/ultima/ultima4/controllers/combat_controller.cpp
index 3174cee643..8acbeaacde 100644
--- a/engines/ultima/ultima4/controllers/combat_controller.cpp
+++ b/engines/ultima/ultima4/controllers/combat_controller.cpp
@@ -644,7 +644,6 @@ bool CombatController::rangedAttack(const Coords &coords, Creature *attacker) {
 
 	/* These effects happen whether or not the opponent was hit */
 	switch (effect) {
-
 	case EFFECT_ELECTRICITY:
 		/* FIXME: are there any special effects here? */
 		soundPlay(SOUND_PC_STRUCK, false);
diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index 72d52d8f0c..dc30f78ca4 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -962,6 +962,7 @@ bool Debugger::cmdReadyWeapon(int argc, const char **argv) {
 		print("");
 		return isDebuggerActive();
 	}
+
 	switch (p->setWeapon(w)) {
 	case EQUIP_SUCCEEDED:
 		print("%s", w->getName().c_str());
@@ -1178,6 +1179,7 @@ bool Debugger::cmdWearArmor(int argc, const char **argv) {
 		print("");
 		return isDebuggerActive();
 	}
+
 	switch (p->setArmor(a)) {
 	case EQUIP_SUCCEEDED:
 		print("%s", a->getName().c_str());
diff --git a/engines/ultima/ultima4/core/debugger_actions.cpp b/engines/ultima/ultima4/core/debugger_actions.cpp
index b46e7adfd7..93eeb8475e 100644
--- a/engines/ultima/ultima4/core/debugger_actions.cpp
+++ b/engines/ultima/ultima4/core/debugger_actions.cpp
@@ -430,8 +430,7 @@ void DebuggerActions::talkRunConversation(Conversation &conv, Person *talker, bo
 
 		int maxlen;
 		switch (conv.getInputRequired(&maxlen)) {
-		case Conversation::INPUT_STRING:
-		{
+		case Conversation::INPUT_STRING: {
 			conv._playerInput = gameGetInput(maxlen);
 #ifdef IOS_ULTIMA4
 			g_screen->screenMessage("%s", conv.playerInput.c_str()); // Since we put this in a different window, we need to show it again.
@@ -441,8 +440,7 @@ void DebuggerActions::talkRunConversation(Conversation &conv, Person *talker, bo
 			showPrompt = true;
 			break;
 		}
-		case Conversation::INPUT_CHARACTER:
-		{
+		case Conversation::INPUT_CHARACTER: {
 			char message[2];
 #ifdef IOS_ULTIMA4
 			U4IOS::IOSConversationChoiceHelper yesNoHelper;
diff --git a/engines/ultima/ultima4/game/creature.cpp b/engines/ultima/ultima4/game/creature.cpp
index 866d8b570b..35bc276bcc 100644
--- a/engines/ultima/ultima4/game/creature.cpp
+++ b/engines/ultima/ultima4/game/creature.cpp
@@ -324,7 +324,6 @@ bool Creature::specialAction() {
 	int broadsidesDirs = 0;
 
 	switch (_id) {
-
 	case LAVA_LIZARD_ID:
 	case SEA_SERPENT_ID:
 	case HYDRA_ID:
@@ -379,7 +378,6 @@ bool Creature::specialEffect() {
 	bool retval = false;
 
 	switch (_id) {
-
 	case STORM_ID: {
 		ObjectDeque::iterator i;
 
@@ -834,7 +832,6 @@ bool Creature::applyDamage(int damage, bool byplayer) {
 		AdjustValueMin(_hp, -damage, 0);
 
 	switch (getState()) {
-
 	case MSTAT_DEAD:
 		if (byplayer)
 			g_screen->screenMessage("%c%s Killed!%c\nExp. %d\n", FG_RED, _name.c_str(), FG_WHITE, _xp);
diff --git a/engines/ultima/ultima4/game/player.cpp b/engines/ultima/ultima4/game/player.cpp
index 1b114c9ea0..86c96f6141 100644
--- a/engines/ultima/ultima4/game/player.cpp
+++ b/engines/ultima/ultima4/game/player.cpp
@@ -285,7 +285,6 @@ void PartyMember::awardXp(int xp) {
 
 bool PartyMember::heal(HealType type) {
 	switch (type) {
-
 	case HT_NONE:
 		return true;
 
diff --git a/engines/ultima/ultima4/gfx/imageloader.cpp b/engines/ultima/ultima4/gfx/imageloader.cpp
index 15ff1142ac..4889cb5cd8 100644
--- a/engines/ultima/ultima4/gfx/imageloader.cpp
+++ b/engines/ultima/ultima4/gfx/imageloader.cpp
@@ -58,7 +58,6 @@ void ImageLoader::setFromRawData(Image *image, int width, int height, int bpp, c
 	int x, y;
 
 	switch (bpp) {
-
 	case 32:
 		for (y = 0; y < height; y++) {
 			for (x = 0; x < width; x++)


Commit: 7296f24ef8c5e1736db37dc68bc6bc05d3f207aa
    https://github.com/scummvm/scummvm/commit/7296f24ef8c5e1736db37dc68bc6bc05d3f207aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-14T19:44:20-07:00

Commit Message:
ULTIMA4: Redraw stats after full stats cheat action

Changed paths:
    engines/ultima/ultima4/core/debugger.cpp


diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index dc30f78ca4..125f0ff2ba 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -1594,6 +1594,7 @@ bool Debugger::cmdFullStats(int argc, const char **argv) {
 		}
 	}
 
+	g_context->_stats->update();
 	print("Full Stats given");
 	return isDebuggerActive();
 }