Changeset 45637

Timestamp:

11/03/09 20:47:10 (2 months ago)

Author:

fingolfin

Message:

SCI: Fix warning (declaration of 'FOO' shadows a member of 'this')

Files:

• scummvm/trunk/engines/sci/gui/gui_menu.h (modified) (2 diffs)

scummvm/trunk/engines/sci/gui/gui_menu.h

@@ -47 +47 @@
         Common::String text;
 
-        GuiMenuEntry(uint16 id)
-         : id(id) { }
+        GuiMenuEntry(uint16 id_)
+         : id(id_) { }
 };
 typedef Common::List<GuiMenuEntry *> GuiMenuList;
@@ -64 +64 @@
         Common::String textRightAligned;
 
-        GuiMenuItemEntry(uint16 menuId, uint16 id)
-         : menuId(menuId), id(id),
+        GuiMenuItemEntry(uint16 menuId_, uint16 id_)
+         : menuId(menuId_), id(id_),
                 enabled(true), tag(0), keyPress(0), keyModifier(0), separatorLine(false) { }
 };