[Scummvm-cvs-logs] scummvm master -> f32c9a7735352784a501bf70a71137478cf9946f

Strangerke Strangerke at scummvm.org
Wed Jun 27 01:17:36 CEST 2012


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:
8b30750f82 CGE: Remove dead code used to display copyright in DOS prompt
f32c9a7735 CGE: Fix bug 3538039 - level buttons not pressed


Commit: 8b30750f821b16c1bb0f6e505aefe41375661a32
    https://github.com/scummvm/scummvm/commit/8b30750f821b16c1bb0f6e505aefe41375661a32
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-06-26T16:15:31-07:00

Commit Message:
CGE: Remove dead code used to display copyright in DOS prompt

Changed paths:
    engines/cge/vga13h.cpp



diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 3800b66..e178795 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -637,15 +637,6 @@ Vga::Vga(CGEEngine *vm) : _frmCnt(0), _msg(NULL), _name(NULL), _setPal(false), _
 		_page[idx]->create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	}
 
-#if 0
-	// This part was used to display credits at the beginning of the game
-	for (int i = 10; i < 20; i++) {
-		char *text = _text->getText(i);
-		if (text) {
-			debugN(1, "%s\n", text);
-		}
-	}
-#endif
 	_oldColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
 	_newColors = (Dac *)malloc(sizeof(Dac) * kPalCount);
 	getColors(_oldColors);


Commit: f32c9a7735352784a501bf70a71137478cf9946f
    https://github.com/scummvm/scummvm/commit/f32c9a7735352784a501bf70a71137478cf9946f
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-06-26T16:15:32-07:00

Commit Message:
CGE: Fix bug 3538039 - level buttons not pressed

Changed paths:
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 2620147..bef4f61 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -1312,7 +1312,7 @@ void CGEEngine::runGame() {
 
 	_sceneLight->_flags._tran = true;
 	_vga->_showQ->append(_sceneLight);
-	_sceneLight->_flags._hide = true;
+	_sceneLight->_flags._hide = false;
 
 	const Seq pocSeq[] = {
 		{ 0, 0, 0, 0, 20 },






More information about the Scummvm-git-logs mailing list