[Scummvm-cvs-logs] SF.net SVN: scummvm: [26618] scummvm/trunk/engines/cruise
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Apr 27 21:59:55 CEST 2007
Revision: 26618
http://scummvm.svn.sourceforge.net/scummvm/?rev=26618&view=rev
Author: fingolfin
Date: 2007-04-27 12:59:40 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Fixing more warnings
Modified Paths:
--------------
scummvm/trunk/engines/cruise/menu.cpp
scummvm/trunk/engines/cruise/menu.h
scummvm/trunk/engines/cruise/object.cpp
scummvm/trunk/engines/cruise/vars.h
Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp 2007-04-27 19:54:14 UTC (rev 26617)
+++ scummvm/trunk/engines/cruise/menu.cpp 2007-04-27 19:59:40 UTC (rev 26618)
@@ -46,7 +46,7 @@
}
// TODO: rewrite to remove the goto
-void addSelectableMenuEntry(int var0, int var1, menuStruct* pMenu, int var2, int color, char* menuText)
+void addSelectableMenuEntry(int param0, int param1, menuStruct* pMenu, int param2, int color, const char* menuText)
{
menuElementStruct* di;
menuElementStruct* var_6;
@@ -63,7 +63,7 @@
do
{
di = var_6;
- if(var2)
+ if(param2)
{
if(!strcmp(var_6->string, menuText))
{
@@ -72,8 +72,8 @@
ASSERT(pSubStruct);
pSubStruct->pNext = NULL;
- pSubStruct->var2 = var0;
- pSubStruct->var4 = var1;
+ pSubStruct->var2 = param0;
+ pSubStruct->var4 = param1;
pSubStructCurrent = pNewElement->ptrSub;
@@ -125,8 +125,8 @@
pNewElement->ptrSub = pSubStruct;
pSubStruct->pNext = NULL;
- pSubStruct->var2 = var0;
- pSubStruct->var4 = var1;
+ pSubStruct->var2 = param0;
+ pSubStruct->var4 = param1;
pMenu->numElements++;
}
Modified: scummvm/trunk/engines/cruise/menu.h
===================================================================
--- scummvm/trunk/engines/cruise/menu.h 2007-04-27 19:54:14 UTC (rev 26617)
+++ scummvm/trunk/engines/cruise/menu.h 2007-04-27 19:59:40 UTC (rev 26618)
@@ -39,7 +39,7 @@
extern menuStruct* menuTable[8];
menuStruct* createMenu(int X, int Y, const char* menuName);
-void addSelectableMenuEntry(int var0, int var1, menuStruct* pMenu, int var2, int color, char* menuText);
+void addSelectableMenuEntry(int var0, int var1, menuStruct* pMenu, int var2, int color, const char* menuText);
void updateMenuMouse(int mouseX, int mouseY, menuStruct* pMenu);
int processMenu(menuStruct* pMenu);
void freeMenu(menuStruct* pMenu);
Modified: scummvm/trunk/engines/cruise/object.cpp
===================================================================
--- scummvm/trunk/engines/cruise/object.cpp 2007-04-27 19:54:14 UTC (rev 26617)
+++ scummvm/trunk/engines/cruise/object.cpp 2007-04-27 19:59:40 UTC (rev 26618)
@@ -282,7 +282,7 @@
void Op_7Sub1(int16 param1, int16 param2, objectStruct* objPtr)
{
int16 var;
- objectStruct* var8;
+ objectStruct* var8_;
objectStruct* var40;
objectStruct* var3E;
objectStruct* currentObjPtrPrevious;
@@ -297,7 +297,7 @@
match = NULL;
var40 = NULL;
var3E = NULL;
- var8 = objPtr;
+ var8_ = objPtr;
while(currentObjPtr2)
{
@@ -351,7 +351,7 @@
if(var>var2)
{
- var8 = currentObjPtr2;
+ var8_ = currentObjPtr2;
}
currentObjPtrPrevious=currentObjPtrPrevious->next;
@@ -364,14 +364,14 @@
{
objectStruct* temp;
- temp = var8->next;
+ temp = var8_->next;
- var8->next = var40;
+ var8_->next = var40;
match->next = temp;
- if(objPtr!=var8)
+ if(objPtr!=var8_)
{
- var40->prev = var8;
+ var40->prev = var8_;
}
if(!temp)
Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h 2007-04-27 19:54:14 UTC (rev 26617)
+++ scummvm/trunk/engines/cruise/vars.h 2007-04-27 19:59:40 UTC (rev 26618)
@@ -41,7 +41,7 @@
struct menuElementStruct
{
struct menuElementStruct* next;
- char* string;
+ const char* string;
int x;
int y;
int varA;
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