[Scummvm-cvs-logs] scummvm master -> 5c9d3e3c0e1698c64fb2f60728689e5cceeaf885

[sev-]

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:
ebad422f2f BBVS: Move much of engine initialization to newGame()
5c9d3e3c0e Merge pull request #706 from eriktorbjorn/bbvs-newgame


Commit: ebad422f2f6a7e0deca3f9baf6f663d07d80ff96
    https://github.com/scummvm/scummvm/commit/ebad422f2f6a7e0deca3f9baf6f663d07d80ff96
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-03-14T06:49:26+01:00

Commit Message:
BBVS: Move much of engine initialization to newGame()

This should fix bug #7057 ("BBVS: No clean-up when restarting").

Changed paths:
    engines/bbvs/bbvs.cpp



diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index d40d5e4..6ae6634 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -137,6 +137,21 @@ BbvsEngine::~BbvsEngine() {
 }
 
 void BbvsEngine::newGame() {
+	memset(_easterEggInput, 0, sizeof(_easterEggInput));
+	_gameTicks = 0;
+	_playVideoNumber = 0;
+	memset(_inventoryItemStatus, 0, sizeof(_inventoryItemStatus));
+	memset(_gameVars, 0, sizeof(_gameVars));
+	memset(_sceneVisited, 0, sizeof(_sceneVisited));
+
+	_mouseX = 160;
+	_mouseY = 120;
+	_mouseButtons = 0;
+
+	_currVerbNum = kVerbLook;
+	_currTalkObjectIndex = -1;
+	_currSceneNum = 0;
+
 	_currInventoryItem = -1;
 	_newSceneNum = 32;
 }
@@ -162,24 +177,10 @@ Common::Error BbvsEngine::run() {
 	_sound = new SoundMan();
 
 	allocSnapshot();
-	memset(_easterEggInput, 0, sizeof(_easterEggInput));
 
-	_gameTicks = 0;
-	_playVideoNumber = 0;
-	_bootSaveSlot = -1;
-
-	memset(_inventoryItemStatus, 0, sizeof(_inventoryItemStatus));
-	memset(_gameVars, 0, sizeof(_gameVars));
-	memset(_sceneVisited, 0, sizeof(_sceneVisited));
-
-	_mouseX = 160;
-	_mouseY = 120;
-	_mouseButtons = 0;
+	newGame();
 
-	_currVerbNum = kVerbLook;
-	_currInventoryItem = -1;
-	_currTalkObjectIndex = -1;
-	_currSceneNum = 0;
+	_bootSaveSlot = -1;
 	_newSceneNum = 31;
 
 	if (ConfMan.hasKey("save_slot"))


Commit: 5c9d3e3c0e1698c64fb2f60728689e5cceeaf885
    https://github.com/scummvm/scummvm/commit/5c9d3e3c0e1698c64fb2f60728689e5cceeaf885
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-14T07:52:50+01:00

Commit Message:
Merge pull request #706 from eriktorbjorn/bbvs-newgame

BBVS: Move much of engine initialization to newGame()

Changed paths:
    engines/bbvs/bbvs.cpp