From 0fd0d1a09f5e40c65cb62d2bb4285492d7a96524 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 3 Nov 2009 20:47:10 +0000 Subject: SCI: Fix warning (declaration of 'FOO' shadows a member of 'this') svn-id: r45637 --- engines/sci/gui/gui_menu.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/sci/gui/gui_menu.h b/engines/sci/gui/gui_menu.h index 919cc39dca..32fbbbaf9a 100644 --- a/engines/sci/gui/gui_menu.h +++ b/engines/sci/gui/gui_menu.h @@ -46,8 +46,8 @@ struct GuiMenuEntry { uint16 id; Common::String text; - GuiMenuEntry(uint16 id) - : id(id) { } + GuiMenuEntry(uint16 id_) + : id(id_) { } }; typedef Common::List GuiMenuList; @@ -63,8 +63,8 @@ struct GuiMenuItemEntry { Common::String text; 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) { } }; typedef Common::List GuiMenuItemList; -- cgit v1.2.3