[Scummvm-cvs-logs] scummvm master -> 2b8cb1c1f09d1e7b946cff3d6320da8026208e6e

athrxx athrxx at scummvm.org
Thu Apr 18 16:50:34 CEST 2013 

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

Summary:
3e9f4943d2 KYRA: (EOB) - add comment in timer_eob.cpp
9fdc70de36 KYRA: (LOL) - add comment in sprites_lol.cpp
4021a04269 KYRA: (LOL) - fix warning (Unused pointer value) in sprites_lol.cpp
2c973a6bff KYRA: (EOB) - fix warning (Logically dead code) in sprites_eob.cpp
0a623ecdec KYRA: (EOB) - fix potential null ptr dereference in sprites_eob.cpp
d3419f6a31 KYRA: (EOB) - add assert in sprites_eob.cpp (might fix warning about possible null ptr deref)
06962db454 KYRA: (HOF) - fix possible out of bounds array access
5ed0770401 KYRA: (HOF) - fix possible null ptr dereference in sequences_hof.cpp
d2d2ed1303 KYRA: (EOB) - remove dead code in screen_eob.cpp
9b74a7bd65 KYRA: (LOL) - fix possible null ptr dereference in scene_lol.cpp
2bdfa47ec0 KYRA: (EOB) - remove unused variable in scene_eob.cpp
3ac156422e KYRA: (LOL) - fix warning about possible out of bounds access in lol.cpp
3d91f3239e KYRA: (LOL) - add assert in items_lol.cpp (should silence warning about possible out of bounds access)
b04059cd23 KYRA: (LOL) - add comment in gui_lol.cpp
2f6d47059b KYRA: (EOB) - fix possible null ptr dereference in gui_eob.cpp
2b8cb1c1f0 KYRA: (EOB) - silence warning about improper use of negative value in gui_eob.cpp


Commit: 3e9f4943d2e715e992f3eedc9abe46b89434350a
    https://github.com/scummvm/scummvm/commit/3e9f4943d2e715e992f3eedc9abe46b89434350a
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:33-07:00

Commit Message:
KYRA: (EOB) - add comment in timer_eob.cpp

Changed paths:
    engines/kyra/timer_eob.cpp



diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index effda22..f7a4e23 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -249,6 +249,7 @@ void EoBCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		case 2:
 		case 3:
 			setCharEventTimer(charIndex, (c->effectFlags & 0x10000) ? 9 : 36, evt + 2, 1);
+			// fall through
 		case 0:
 		case 1:
 		case 4:


Commit: 9fdc70de36e859c18c7a420f80d949203e2aff72
    https://github.com/scummvm/scummvm/commit/9fdc70de36e859c18c7a420f80d949203e2aff72
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:35-07:00

Commit Message:
KYRA: (LOL) - add comment in sprites_lol.cpp

Changed paths:
    engines/kyra/sprites_lol.cpp



diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 88b24e1..ba64b5c 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -567,6 +567,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 					case 2:
 					case 6:
 						flg |= 0x10;
+						// fall through
 					case 0:
 					case 4:
 						shpIndex = _flyingItemShapes[shpIndex].shapeLeft;


Commit: 4021a04269334a8c3f6d679cdc7b3bc0e31f6e36
    https://github.com/scummvm/scummvm/commit/4021a04269334a8c3f6d679cdc7b3bc0e31f6e36
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:36-07:00

Commit Message:
KYRA: (LOL) - fix warning (Unused pointer value) in sprites_lol.cpp

Changed paths:
    engines/kyra/sprites_lol.cpp



diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index ba64b5c..4d4d596 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -503,7 +503,6 @@ int LoLEngine::checkBlockOccupiedByParty(int x, int y, int testFlag) {
 void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 	LevelBlockProperty *l = _visibleBlocks[blockArrayIndex];
 	uint16 s = l->assignedObjects;
-	LoLObject *obj = findObject(s);
 
 	if (l->direction != _currentDirection) {
 		l->drawObjects = 0;
@@ -511,8 +510,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 
 		while (s) {
 			reassignDrawObjects(_currentDirection, s, l, true);
-			obj = findObject(s);
-			s = obj->nextAssignedObject;
+			s = findObject(s)->nextAssignedObject;
 		}
 	}
 


Commit: 2c973a6bff6b83ac803a4a2a2c7e189fd730df7b
    https://github.com/scummvm/scummvm/commit/2c973a6bff6b83ac803a4a2a2c7e189fd730df7b
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:38-07:00

Commit Message:
KYRA: (EOB) - fix warning (Logically dead code) in sprites_eob.cpp

Changed paths:
    engines/kyra/sprites_eob.cpp



diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 962efe6..bb54183 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -551,8 +551,6 @@ void EoBCoreEngine::drawMonsters(int index) {
 
 			SpriteDecoration *dcr = &_monsterDecorations[(p->decorations[ii] - 1) * 6 + subFrame + shpIndex - 1];
 
-			if (!dcr)
-				continue;
 			if (!dcr->shp)
 				continue;
 


Commit: 0a623ecdece7fd90525f81fcbba2a937986098cf
    https://github.com/scummvm/scummvm/commit/0a623ecdece7fd90525f81fcbba2a937986098cf
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:39-07:00

Commit Message:
KYRA: (EOB) - fix potential null ptr dereference in sprites_eob.cpp

Changed paths:
    engines/kyra/sprites_eob.cpp



diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index bb54183..f713508 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -247,6 +247,9 @@ void EoBCoreEngine::updateAttackingMonsterFlags() {
 		m2 = m;
 	}
 
+	if (!m2)
+		return;
+
 	if (m2->type == 7)
 		setScriptFlags(4);
 


Commit: d3419f6a313e7ba214c88da1fad48d36d4423aba
    https://github.com/scummvm/scummvm/commit/d3419f6a313e7ba214c88da1fad48d36d4423aba
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:40-07:00

Commit Message:
KYRA: (EOB) - add assert in sprites_eob.cpp (might fix warning about possible null ptr deref)

Changed paths:
    engines/kyra/sprites_eob.cpp



diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index f713508..1d4c143 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -653,6 +653,8 @@ void EoBCoreEngine::drawFlyingObjects(int index) {
 			}
 		}
 
+		assert(shp);
+
 		shp = _screen->scaleShape(shp, sclValue);
 
 		if (rstFade) {


Commit: 06962db454c0a73087a06511b70accc69053bba8
    https://github.com/scummvm/scummvm/commit/06962db454c0a73087a06511b70accc69053bba8
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:42-07:00

Commit Message:
KYRA: (HOF) - fix possible out of bounds array access

Changed paths:
    engines/kyra/sequences_hof.cpp



diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index e70bbca..a4294cb 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -1041,7 +1041,8 @@ void SeqPlayer_HOF::playDialogueAnimation(uint16 strID, uint16 soundID, int text
 	int dur = int(strlen(_sequenceStrings[strID])) * (_vm->gameFlags().isTalkie ? 7 : 15);
 	if (_vm->textEnabled()) {
 		int slot = displaySubTitle(strID, textPosX, textPosY, dur, textWidth);
-		_textSlots[slot].textcolor = textColor;
+		if (slot >= 0)
+			_textSlots[slot].textcolor = textColor;
 	}
 	_specialAnimTimeOutTotal = _system->getMillis() + dur * _vm->tickLength();
 	int curframe = animStartFrame;


Commit: 5ed0770401ed12d8be5f8e11f10f978789f1ae3d
    https://github.com/scummvm/scummvm/commit/5ed0770401ed12d8be5f8e11f10f978789f1ae3d
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:43-07:00

Commit Message:
KYRA: (HOF) - fix possible null ptr dereference in sequences_hof.cpp

Changed paths:
    engines/kyra/sequences_hof.cpp



diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index a4294cb..306f504 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -942,8 +942,8 @@ void SeqPlayer_HOF::playAnimation(WSAMovie_v2 *wsaObj, int startFrame, int lastF
 	bool finished = false;
 	uint32 startTime = _system->getMillis();
 
-	int origW = wsaObj->width();
-	int origH = wsaObj->width();
+	int origW = wsaObj ? wsaObj->width() : 0;
+	int origH = wsaObj ? wsaObj->height() : 0;
 	int drwX = x;
 	int drwY = y;
 	int drwW = origW;


Commit: d2d2ed1303e2214cb1c3879641ad64b6bec68fea
    https://github.com/scummvm/scummvm/commit/d2d2ed1303e2214cb1c3879641ad64b6bec68fea
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:45-07:00

Commit Message:
KYRA: (EOB) - remove dead code in screen_eob.cpp

Changed paths:
    engines/kyra/screen_eob.cpp



diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index b1b2635..ae62e52 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -456,8 +456,6 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 						if (col < 0x10) {
 							*pal++ = s;
 							c = colorMap[s] = col++;
-							if (!col)
-								c = 0;
 						} else {
 							c = 0;
 						}


Commit: 9b74a7bd65668a75db75ef36fb10976d49fde02d
    https://github.com/scummvm/scummvm/commit/9b74a7bd65668a75db75ef36fb10976d49fde02d
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:46-07:00

Commit Message:
KYRA: (LOL) - fix possible null ptr dereference in scene_lol.cpp

Changed paths:
    engines/kyra/scene_lol.cpp



diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index f1045d2..c8618bc 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -315,7 +315,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
 		if (_lastSpecialColor == 1)
 			_lastSpecialColor = 0x44;
 		else if (_lastSpecialColor == 0x66)
-			_lastSpecialColor = scumm_stricmp(file, "YVEL2") ? 0xCC : 0x44;
+			_lastSpecialColor = file ? (scumm_stricmp(file, "YVEL2") ? 0xCC : 0x44) : 0x44;
 		else if (_lastSpecialColor == 0x6B)
 			_lastSpecialColor = 0xCC;
 		else


Commit: 2bdfa47ec0ad4d35e99789698838317380834229
    https://github.com/scummvm/scummvm/commit/2bdfa47ec0ad4d35e99789698838317380834229
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:48-07:00

Commit Message:
KYRA: (EOB) - remove unused variable in scene_eob.cpp

Changed paths:
    engines/kyra/scene_eob.cpp



diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 84cf4a3..45de232 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -259,7 +259,7 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 	}
 
 	if (_flags.gameID == GI_EOB2)
-		pos = initScriptTimers(pos);
+		initScriptTimers(pos);
 
 	return _curGfxFile;
 }


Commit: 3ac156422e09341f2acfba352a06c9629b6e0b20
    https://github.com/scummvm/scummvm/commit/3ac156422e09341f2acfba352a06c9629b6e0b20
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:49-07:00

Commit Message:
KYRA: (LOL) - fix warning about possible out of bounds access in lol.cpp

Changed paths:
    engines/kyra/lol.cpp



diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index f7696d4..3af65d9 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1363,7 +1363,7 @@ void LoLEngine::setCharacterMagicOrHitPoints(int charNum, int type, int points,
 		{ 0x21, 0xAA, 0x99, 0x00, 0x4253 }
 	};
 
-	if (charNum > 3)
+	if (charNum > 2)
 		return;
 
 	LoLCharacter *c = &_characters[charNum];
@@ -1851,7 +1851,7 @@ int LoLEngine::playCharacterScriptChat(int charId, int mode, int restorePortrait
 	} else if (charId > 0) {
 		int i = 0;
 
-		for (; i < 4; i++) {
+		for (; i < 3; i++) {
 			if (_characters[i].id != charId || !(_characters[i].flags & 1))
 				continue;
 			if (charId == ch)


Commit: 3d91f3239ec56cc49e42bbe22eb6162b3cc083a7
    https://github.com/scummvm/scummvm/commit/3d91f3239ec56cc49e42bbe22eb6162b3cc083a7
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:51-07:00

Commit Message:
KYRA: (LOL) - add assert in items_lol.cpp (should silence warning about possible out of bounds access)

Changed paths:
    engines/kyra/items_lol.cpp



diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index f7fd04b..f402447 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -265,6 +265,7 @@ bool LoLEngine::addItemToInventory(Item itemIndex) {
 		gui_drawInventory();
 	}
 
+	assert(pos > 0 && pos < 48);
 	_inventory[pos] = itemIndex;
 	gui_drawInventory();
 


Commit: b04059cd23ffc235f2a4518a040de76d2d390926
    https://github.com/scummvm/scummvm/commit/b04059cd23ffc235f2a4518a040de76d2d390926
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:52-07:00

Commit Message:
KYRA: (LOL) - add comment in gui_lol.cpp

Changed paths:
    engines/kyra/gui_lol.cpp



diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index f7a5386..b73eddb 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -697,7 +697,7 @@ void LoLEngine::gui_toggleButtonDisplayMode(int shapeIndex, int mode) {
 		t = _system->getMillis();
 		if (_buttonPressTimer > t)
 			delay(_buttonPressTimer - t);
-
+		// fall through
 	case 2:
 		mode = 0;
 		_lastButtonShape = 0;


Commit: 2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc
    https://github.com/scummvm/scummvm/commit/2f6d47059ba8c63d0f8e2f52e5498cab8b9f07bc
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:54-07:00

Commit Message:
KYRA: (EOB) - fix possible null ptr dereference in gui_eob.cpp

Changed paths:
    engines/kyra/gui_eob.cpp



diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index ed3aaef..a213380 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2056,9 +2056,8 @@ void GUI_EoB::runCampMenu() {
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
 			inputFlag = 0x8007;
-		else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+		else if (prevHighlightButton && (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]))
 			inputFlag = 0x8000 + prevHighlightButton->index;
-		}
 
 		Button *clickedButton = _vm->gui_getButton(buttonList, inputFlag & 0x7FFF);
 


Commit: 2b8cb1c1f09d1e7b946cff3d6320da8026208e6e
    https://github.com/scummvm/scummvm/commit/2b8cb1c1f09d1e7b946cff3d6320da8026208e6e
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T07:10:55-07:00

Commit Message:
KYRA: (EOB) - silence warning about improper use of negative value in gui_eob.cpp

Changed paths:
    engines/kyra/gui_eob.cpp



diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index a213380..9b4c09d 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1300,24 +1300,24 @@ void EoBCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 
 	case 14:
 		// Potion
-		usePotion(charIndex, wslot);
+		usePotion(charIndex, slotIndex);
 		break;
 
 	case 18:
-		useWand(charIndex, wslot);
+		useWand(charIndex, slotIndex);
 		break;
 
 	case 19:
 		// eob2 horn
-		useHorn(charIndex, wslot);
+		useHorn(charIndex, slotIndex);
 		break;
 
 	case 20:
 		if (vl == 1)
 			inflictCharacterDamage(charIndex, 200);
 		else
-			useMagicScroll(charIndex, 55, wslot);
-		deleteInventoryItem(charIndex, wslot);
+			useMagicScroll(charIndex, 55, slotIndex);
+		deleteInventoryItem(charIndex, slotIndex);
 		break;
 
 	default:

More information about the Scummvm-git-logs mailing list