[Scummvm-cvs-logs] scummvm master -> 031628767652a7227b527dc06316d5f7e113b4ba

[eriktorbjorn]

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:
85d22158b8 M4: Silence GCC warning (one of several)
0316287676 Merge branch 'master' of github.com:scummvm/scummvm


Commit: 85d22158b88cf0c690a18ede95cd0501df61a13f
    https://github.com/scummvm/scummvm/commit/85d22158b88cf0c690a18ede95cd0501df61a13f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-10-09T02:28:37-07:00

Commit Message:
M4: Silence GCC warning (one of several)

Changed paths:
    engines/m4/m4_views.cpp



diff --git a/engines/m4/m4_views.cpp b/engines/m4/m4_views.cpp
index 78c4092..1324526 100644
--- a/engines/m4/m4_views.cpp
+++ b/engines/m4/m4_views.cpp
@@ -231,11 +231,9 @@ M4InterfaceView::M4InterfaceView(MadsM4Engine *vm):
 	_selected = false;
 
 	Common::SeekableReadStream *data = _vm->res()->get(INTERFACE_SERIES);
-	RGB8 *palette;
-
 	_sprites = new SpriteAsset(_vm, data, data->size(), INTERFACE_SERIES);
-	palette = _sprites->getPalette();
 
+	//RGB8 *palette = _sprites->getPalette();
 	//Palette.setPalette(palette, 0, _sprites->getColorCount());
 
 	_vm->res()->toss(INTERFACE_SERIES);


Commit: 031628767652a7227b527dc06316d5f7e113b4ba
    https://github.com/scummvm/scummvm/commit/031628767652a7227b527dc06316d5f7e113b4ba
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-10-09T02:30:59-07:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
    engines/tsage/globals.cpp
    engines/tsage/globals.h