diff options
| author | Max Horn | 2009-11-03 20:47:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-11-03 20:47:10 +0000 |
| commit | 0fd0d1a09f5e40c65cb62d2bb4285492d7a96524 (patch) | |
| tree | 9b5c9703b8e31c2c23a5eb4d871bdcf9991b2d14 /engines/sci | |
| parent | 55ebcf69e527baec00b4970f6693c89a7a28e2bc (diff) | |
| download | scummvm-rg350-0fd0d1a09f5e40c65cb62d2bb4285492d7a96524.tar.gz scummvm-rg350-0fd0d1a09f5e40c65cb62d2bb4285492d7a96524.tar.bz2 scummvm-rg350-0fd0d1a09f5e40c65cb62d2bb4285492d7a96524.zip | |
SCI: Fix warning (declaration of 'FOO' shadows a member of 'this')
svn-id: r45637
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/gui/gui_menu.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<GuiMenuEntry *> 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<GuiMenuItemEntry *> GuiMenuItemList; |