[Scummvm-cvs-logs] scummvm master -> 6a84bf61a54bec04702629a335d601554549054b

Strangerke Strangerke at scummvm.org
Sun Mar 2 18:03:44 CET 2014


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

Summary:
6a84bf61a5 MISC: Revert 2 files accidentally modified in 418de45d9cebfbabb05edd09ca5206d95d693867


Commit: 6a84bf61a54bec04702629a335d601554549054b
    https://github.com/scummvm/scummvm/commit/6a84bf61a54bec04702629a335d601554549054b
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-02T09:02:02-08:00

Commit Message:
MISC: Revert 2 files accidentally modified in 418de45d9cebfbabb05edd09ca5206d95d693867

Changed paths:
    dists/msvc9/create_msvc9.bat
    engines/tsage/scenes.cpp



diff --git a/dists/msvc9/create_msvc9.bat b/dists/msvc9/create_msvc9.bat
index 61a9ea8..34bcccd 100644
--- a/dists/msvc9/create_msvc9.bat
+++ b/dists/msvc9/create_msvc9.bat
@@ -55,28 +55,28 @@ goto done
 echo.
 echo Creating project files with all engines enabled (stable and unstable)
 echo.
-create_project ..\.. --enable-all-engines --msvc --msvc-version 9  --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision
+create_project ..\.. --enable-all-engines --msvc --msvc-version 9
 goto done
 
 :stable
 echo.
 echo Creating normal project files, with only the stable engines enabled
 echo.
-create_project ..\.. --msvc --msvc-version 9  --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision
+create_project ..\.. --msvc --msvc-version 9
 goto done
 
 :tools
 echo.
 echo Creating tools project files
 echo.
-create_project ..\.. --tools --msvc --msvc-version 9  --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision
+create_project ..\.. --tools --msvc --msvc-version 9
 goto done
 
 :tests
 echo.
 echo Creating tests project files
 echo.
-create_project ..\.. --tests --msvc --msvc-version 9  --disable-taskbar --disable-freetype --disable-jpeg --disable-engine=zvision
+create_project ..\.. --tests --msvc --msvc-version 9
 goto done
 
 :clean_check
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index d0150dc..80ce1e3 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -150,7 +150,6 @@ void SceneManager::fadeInIfNecessary() {
 
 void SceneManager::changeScene(int newSceneNumber) {
 	debug(1, "changeScene(%d)", newSceneNumber);
-	warning("Scene %d", newSceneNumber);
 
 	// Fade out the scene
 	ScenePalette scenePalette;






More information about the Scummvm-git-logs mailing list