[Scummvm-cvs-logs] scummvm master -> 8e409622f80e02cd0f775adede4115b3575a3995

[sev-]

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:
f6283094ac AGI: Remove useless code.
fcc94778e4 CINE: Remove useless code.
921efd6880 KYRA: Remove redundant code.
8e409622f8 CREDITS: Add Lubomyr to Android porters


Commit: f6283094acebd6ea0587689716cf749d0a352a9d
    https://github.com/scummvm/scummvm/commit/f6283094acebd6ea0587689716cf749d0a352a9d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T19:04:59+02:00

Commit Message:
AGI: Remove useless code.

We set vtEntries to SCREENOBJECTS_MAX, thus, the loop
for (i = vtEntries; i < SCREENOBJECTS_MAX; i++) is a no-op.

Changed paths:
    engines/agi/saveload.cpp



diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 09fce93..aa46cf4 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -689,9 +689,6 @@ int AgiEngine::loadGame(const Common::String &fileName, bool checkId) {
 			}
 		}
 	}
-	for (i = vtEntries; i < SCREENOBJECTS_MAX; i++) {
-		memset(&_game.screenObjTable[i], 0, sizeof(ScreenObjEntry));
-	}
 
 	// Fix some pointers in screenObjTable
 


Commit: fcc94778e4178aefff0de581c8c5dd7482aeacb9
    https://github.com/scummvm/scummvm/commit/fcc94778e4178aefff0de581c8c5dd7482aeacb9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T19:11:07+02:00

Commit Message:
CINE: Remove useless code.

var_2 used to be always NULL after while() loop, thus, the first if()
condition is always false.

Changed paths:
    engines/cruise/cell.cpp



diff --git a/engines/cruise/cell.cpp b/engines/cruise/cell.cpp
index b7cef41..4653946 100644
--- a/engines/cruise/cell.cpp
+++ b/engines/cruise/cell.cpp
@@ -129,15 +129,12 @@ void createTextObject(cellStruct *pObject, int overlayIdx, int messageIdx, int x
 
 	cellStruct *pNewElement;
 	cellStruct *si = pObject->next;
-	cellStruct *var_2;
 
 	while (si) {
 		pObject = si;
 		si = si->next;
 	}
 
-	var_2 = si;
-
 	pNewElement = (cellStruct *) MemAlloc(sizeof(cellStruct));
 	memset(pNewElement, 0, sizeof(cellStruct));
 
@@ -157,11 +154,7 @@ void createTextObject(cellStruct *pObject, int overlayIdx, int messageIdx, int x
 	pNewElement->parentOverlay = parentOvl;
 	pNewElement->gfxPtr = NULL;
 
-	if (var_2) {
-		cx = var_2;
-	} else {
-		cx = savePObject;
-	}
+	cx = savePObject;
 
 	pNewElement->prev = cx->prev;
 	cx->prev = pNewElement;


Commit: 921efd6880c5b45f582ecc6e6ef720eebcb4d4c9
    https://github.com/scummvm/scummvm/commit/921efd6880c5b45f582ecc6e6ef720eebcb4d4c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T19:12:14+02:00

Commit Message:
KYRA: Remove redundant code.

item variable value is less than 33, that is, 32 max. item+1 is never > 33.
Thus, the clapping code is redundant.

Changed paths:
    engines/kyra/items_lok.cpp



diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp
index 55a23b2..3a2e631 100644
--- a/engines/kyra/items_lok.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -844,8 +844,6 @@ void KyraEngine_LoK::updatePlayerItemsForScene() {
 		uint8 item = _currentCharacter->inventoryItems[i];
 		if (item >= 29 && item < 33) {
 			++item;
-			if (item > 33)
-				item = 33;
 			_currentCharacter->inventoryItems[i] = item;
 			redraw = true;
 		}


Commit: 8e409622f80e02cd0f775adede4115b3575a3995
    https://github.com/scummvm/scummvm/commit/8e409622f80e02cd0f775adede4115b3575a3995
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-17T19:30:07+02:00

Commit Message:
CREDITS: Add Lubomyr to Android porters

Changed paths:
    AUTHORS
    devtools/credits.pl
    gui/credits.h



diff --git a/AUTHORS b/AUTHORS
index d26ab29..6956e09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -281,6 +281,7 @@ ScummVM Team
     Android:
        Andre Heider
        Angus Lees
+       Lubomyr Lisen
 
     Dreamcast:
        Marcus Comstedt
diff --git a/devtools/credits.pl b/devtools/credits.pl
index cc75f76..e695a36 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -817,6 +817,7 @@ begin_credits("Credits");
 			begin_section("Android");
 				add_person("Andre Heider", "dhewg", "");
 				add_person("Angus Lees", "Gus", "");
+				add_person("Lubomyr Lisen", "", "");
 			end_section();
 
 			begin_section("Dreamcast");
@@ -844,7 +845,7 @@ begin_credits("Credits");
 				add_person("Frantisek Dufka", "fanoush", "(retired)");
 				add_person("Tarek Soliman", "tsoliman", "");
 			end_section();
-			
+
 			begin_section("Nintendo 3DS");
 				add_person("Thomas Edvalson", "Cruel", "");
 			end_section();
diff --git a/gui/credits.h b/gui/credits.h
index c5af88e..e27973c 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -343,6 +343,7 @@ static const char *credits[] = {
 "C1""Android",
 "C0""Andre Heider",
 "C0""Angus Lees",
+"C0""Lubomyr Lisen",
 "",
 "C1""Dreamcast",
 "C0""Marcus Comstedt",