[Scummvm-cvs-logs] scummvm master -> 9afeafd3fd1b3151c32afd6da2b5f36d3ae9a5a0

lordhoto lordhoto at gmail.com
Thu Jan 16 23:01:00 CET 2014


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:
67bf71f43a KYRA: Slight cleanup.
9afeafd3fd TONY: Cleanup (don't compare pointer with false).


Commit: 67bf71f43ae0c4a6b011429a1094f1f66a4dcda2
    https://github.com/scummvm/scummvm/commit/67bf71f43ae0c4a6b011429a1094f1f66a4dcda2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-16T13:56:52-08:00

Commit Message:
KYRA: Slight cleanup.

Changed paths:
    engines/kyra/staticres.cpp



diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index c52b0a0..522e12f 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1172,7 +1172,7 @@ void GUI_LoK::initStaticResource() {
 	GUI_V1_MENU_ITEM(_menu[5].item[2], 1, 0, 0, 0, 0xA5, 0, 0x40, 0x80, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0x10, 0x42, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[5].item[3], 1, 0, 0, 0, 0xA5, 0, 0x51, 0x80, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0x10, 0x53, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[5].item[4], 1, 0, 0, 0, 0xA5, 0, 0x62, 0x80, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0x10, 0x65, 0, 0);
-	GUI_V1_MENU_ITEM(_menu[5].item[5], 1, 0, 0, 0,   -1, 0, 0x7F, 0x6C, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, -0, 0, 0, 0, 0);
+	GUI_V1_MENU_ITEM(_menu[5].item[5], 1, 0, 0, 0,   -1, 0, 0x7F, 0x6C, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	_menu[5].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeMusic);
 	_menu[5].item[1].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeSounds);
 	_menu[5].item[2].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeWalk);


Commit: 9afeafd3fd1b3151c32afd6da2b5f36d3ae9a5a0
    https://github.com/scummvm/scummvm/commit/9afeafd3fd1b3151c32afd6da2b5f36d3ae9a5a0
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-16T13:58:38-08:00

Commit Message:
TONY: Cleanup (don't compare pointer with false).

Changed paths:
    engines/tony/mpal/mpal.cpp



diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 5f2452d..19e3d43 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -963,7 +963,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 					// Ok, we can perform the action. For convenience, we do it in a new process
 					_ctx->newItem = (LpMpalItem)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(MpalItem));
-					if (_ctx->newItem == false) {
+					if (!_ctx->newItem) {
 						globalDestroy(_ctx->myThreads);
 						globalDestroy(_ctx->myActions);
 






More information about the Scummvm-git-logs mailing list