[Scummvm-cvs-logs] SF.net SVN: scummvm:[40632] scummvm/trunk/engines/cruise
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sun May 17 07:12:10 CEST 2009
Revision: 40632
http://scummvm.svn.sourceforge.net/scummvm/?rev=40632&view=rev
Author: dreammaster
Date: 2009-05-17 05:12:10 +0000 (Sun, 17 May 2009)
Log Message:
-----------
Properly named the dialog menu item 'selected' field
Modified Paths:
--------------
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/mainDraw.cpp
scummvm/trunk/engines/cruise/menu.cpp
scummvm/trunk/engines/cruise/vars.h
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2009-05-16 23:16:02 UTC (rev 40631)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2009-05-17 05:12:10 UTC (rev 40632)
@@ -774,7 +774,7 @@
pMenuElement = pMenu->ptrNextElement;
while (pMenuElement) {
- if (pMenuElement->varC) {
+ if (pMenuElement->selected) {
currentMenuElementX = pMenuElement->x;
currentMenuElementY = pMenuElement->y;
currentMenuElement = pMenuElement;
Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp 2009-05-16 23:16:02 UTC (rev 40631)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp 2009-05-17 05:12:10 UTC (rev 40632)
@@ -1313,7 +1313,7 @@
int color;
- if (p1->varC) {
+ if (p1->selected) {
color = selectColor;
} else {
if (p1->color != 255) {
Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp 2009-05-16 23:16:02 UTC (rev 40631)
+++ scummvm/trunk/engines/cruise/menu.cpp 2009-05-17 05:12:10 UTC (rev 40632)
@@ -101,7 +101,7 @@
pNewElement->string = menuText;
pNewElement->next = NULL;
- pNewElement->varC = 0;
+ pNewElement->selected = false;
pNewElement->color = color;
pNewElement->gfx = renderText(160, menuText);
@@ -129,13 +129,13 @@
menuElementStruct *pCurrentEntry = pMenu->ptrNextElement;
while (pCurrentEntry) {
- pCurrentEntry->varC = 0;
+ pCurrentEntry->selected = false;
if (var_2 == 0) {
if ((mouseX > pCurrentEntry->x) && ((pCurrentEntry->x + 160) >= mouseX)) {
if ((mouseY > pCurrentEntry->y) && ((pCurrentEntry->y + height) >= mouseY)) {
var_2 = 1;
- pCurrentEntry->varC = 1;
+ pCurrentEntry->selected = true;
}
}
}
Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h 2009-05-16 23:16:02 UTC (rev 40631)
+++ scummvm/trunk/engines/cruise/vars.h 2009-05-17 05:12:10 UTC (rev 40632)
@@ -45,7 +45,7 @@
int x;
int y;
int varA;
- int varC;
+ bool selected;
unsigned char color;
gfxEntryStruct *gfx;
menuElementSubStruct *ptrSub;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list