[Scummvm-git-logs] scummvm master -> 0cf74a6309511bef0a2829d170d07f95ddc1681b

[dreammaster]

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

Summary:
b8715dca0e XEEN: Cleanup of unused local in Scripts
e5ff44eaf3 XEEN: Fix gfx glitch in top-left corner of the minimap
54ff19bcf5 XEEN: Fix double-casting of spells during combat
0cf74a6309 XEEN: Regenerate xeen.ccs datafile


Commit: b8715dca0ed6d536dca45489a9b00763103c0107
    https://github.com/scummvm/scummvm/commit/b8715dca0ed6d536dca45489a9b00763103c0107
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T18:30:37-04:00

Commit Message:
XEEN: Cleanup of unused local in Scripts

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 34f059c..47cea99 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -596,7 +596,7 @@ bool Scripts::cmdTakeOrGive(ParamsIterator &params) {
 	Combat &combat = *_vm->_combat;
 	Party &party = *_vm->_party;
 	Windows &windows = *_vm->_windows;
-	int mode1, mode2, mode3, param2;
+	int mode1, mode2, mode3;
 	uint32 val1, val2, val3;
 
 	_refreshIcons = true;
@@ -618,7 +618,7 @@ bool Scripts::cmdTakeOrGive(ParamsIterator &params) {
 		break;
 	}
 
-	param2 = mode2 = params.readByte();
+	mode2 = params.readByte();
 	switch (mode2) {
 	case 16:
 	case 34:


Commit: e5ff44eaf32bb4ca907f2bc4239ecd4332414ac9
    https://github.com/scummvm/scummvm/commit/e5ff44eaf32bb4ca907f2bc4239ecd4332414ac9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T18:30:45-04:00

Commit Message:
XEEN: Fix gfx glitch in top-left corner of the minimap

Changed paths:
    engines/xeen/interface_minimap.cpp


diff --git a/engines/xeen/interface_minimap.cpp b/engines/xeen/interface_minimap.cpp
index 5ab1069..583156c 100644
--- a/engines/xeen/interface_minimap.cpp
+++ b/engines/xeen/interface_minimap.cpp
@@ -141,7 +141,7 @@ void InterfaceMinimap::drawIndoorsMinimap() {
 	}
 
 	// Draw the specific surface type for each cell
-	for (int yp = MINIMAP_YSTART + (TILE_HEIGHT / 2), mazeY = pt.y + MINIMAP_DIFF;
+	for (int yp = MINIMAP_YSTART + (TILE_HEIGHT / 2) + 1, mazeY = pt.y + MINIMAP_DIFF;
 			mazeY >= (pt.y - MINIMAP_DIFF); yp += TILE_HEIGHT, --mazeY) {
 		for (int xp = MINIMAP_XSTART + (TILE_WIDTH / 2), mazeX = pt.x - MINIMAP_DIFF;
 				mazeX <= (pt.x + MINIMAP_DIFF); xp += TILE_WIDTH, ++mazeX) {
@@ -166,8 +166,8 @@ void InterfaceMinimap::drawIndoorsMinimap() {
 	}
 
 	// Handle drawing surface sprites partially clipped at the left edge
-	for (int yp = MINIMAP_YSTART, mazeY = pt.y + MINIMAP_DIFF; mazeY >= (pt.y - MINIMAP_DIFF);
-			yp += TILE_HEIGHT, --mazeY) {
+	for (int yp = MINIMAP_YSTART + (TILE_HEIGHT / 2) + 1, mazeY = pt.y + MINIMAP_DIFF;
+			mazeY >= (pt.y - MINIMAP_DIFF); yp += TILE_HEIGHT, --mazeY) {
 		v = map.mazeLookup(Common::Point(pt.x - MINIMAP_DIFF - 1, mazeY), 0, 0xffff);
 
 		if (v != INVALID_CELL && map._currentSurfaceId &&


Commit: 54ff19bcf501516555ee37059bf6ac0e6f01baa3
    https://github.com/scummvm/scummvm/commit/54ff19bcf501516555ee37059bf6ac0e6f01baa3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T18:40:47-04:00

Commit Message:
XEEN: Fix double-casting of spells during combat

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 1a79002..3da5dc7 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -512,21 +512,18 @@ void Interface::perform() {
 		}
 		break;
 
-	case Common::KEYCODE_c: {
+	case Common::KEYCODE_c:
 		// Cast spell
 		if (_tillMove) {
 			combat.moveMonsters();
 			draw3d(true);
 		}
 
-		int result = CastSpell::show(_vm);
-
-		if (result == 1) {
+		if (CastSpell::show(_vm) != -1) {
 			chargeStep();
 			doStepCode();
 		}
 		break;
-	}
 
 	case Common::KEYCODE_i:
 		// Show Info dialog
@@ -1442,7 +1439,6 @@ void Interface::doCombat() {
 	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
 	Scripts &scripts = *_vm->_scripts;
-	Spells &spells = *_vm->_spells;
 	Sound &sound = *_vm->_sound;
 	Windows &windows = *_vm->_windows;
 	bool upDoorText = _upDoorText;
@@ -1556,10 +1552,7 @@ void Interface::doCombat() {
 
 			case Common::KEYCODE_c: {
 				// Cast spell
-				int spellId = CastSpell::show(_vm);
-				if (spellId != -1) {
-					Character *c = combat._combatParty[combat._whosTurn];
-					spells.castSpell(c, (MagicSpell)spellId);
+				if (CastSpell::show(_vm) != -1) {
 					nextChar();
 				} else {
 					highlightChar(combat._whosTurn);


Commit: 0cf74a6309511bef0a2829d170d07f95ddc1681b
    https://github.com/scummvm/scummvm/commit/0cf74a6309511bef0a2829d170d07f95ddc1681b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T18:42:20-04:00

Commit Message:
XEEN: Regenerate xeen.ccs datafile

Changed paths:
    dists/engine-data/xeen.ccs


diff --git a/dists/engine-data/xeen.ccs b/dists/engine-data/xeen.ccs
index 162e7fa..e313a0f 100644
Binary files a/dists/engine-data/xeen.ccs and b/dists/engine-data/xeen.ccs differ