forked from mirror/openmw-tes3mp
Disable the invenory window for now, it's not complete and gives compiler warnings.
This commit is contained in:
parent
3f1b90e732
commit
b037780a7d
3 changed files with 12 additions and 0 deletions
|
@ -271,6 +271,7 @@ namespace MWGui
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if 0
|
||||||
class InventoryWindow : public OEngine::GUI::Layout
|
class InventoryWindow : public OEngine::GUI::Layout
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -389,5 +390,6 @@ namespace MWGui
|
||||||
MyGUI::Colour activeColor;
|
MyGUI::Colour activeColor;
|
||||||
MyGUI::Colour inactiveColor;
|
MyGUI::Colour inactiveColor;
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -37,7 +37,9 @@ WindowManager::WindowManager(MyGUI::Gui *_gui, MWWorld::Environment& environment
|
||||||
menu = new MainMenu(w,h);
|
menu = new MainMenu(w,h);
|
||||||
map = new MapWindow();
|
map = new MapWindow();
|
||||||
stats = new StatsWindow (environment.mWorld->getStore());
|
stats = new StatsWindow (environment.mWorld->getStore());
|
||||||
|
#if 0
|
||||||
inventory = new InventoryWindow ();
|
inventory = new InventoryWindow ();
|
||||||
|
#endif
|
||||||
console = new Console(w,h, environment, extensions);
|
console = new Console(w,h, environment, extensions);
|
||||||
|
|
||||||
// The HUD is always on
|
// The HUD is always on
|
||||||
|
@ -54,7 +56,9 @@ WindowManager::~WindowManager()
|
||||||
delete map;
|
delete map;
|
||||||
delete menu;
|
delete menu;
|
||||||
delete stats;
|
delete stats;
|
||||||
|
#if 0
|
||||||
delete inventory;
|
delete inventory;
|
||||||
|
#endif
|
||||||
|
|
||||||
delete nameDialog;
|
delete nameDialog;
|
||||||
delete raceDialog;
|
delete raceDialog;
|
||||||
|
@ -66,7 +70,9 @@ void WindowManager::updateVisible()
|
||||||
map->setVisible(false);
|
map->setVisible(false);
|
||||||
menu->setVisible(false);
|
menu->setVisible(false);
|
||||||
stats->setVisible(false);
|
stats->setVisible(false);
|
||||||
|
#if 0
|
||||||
inventory->setVisible(false);
|
inventory->setVisible(false);
|
||||||
|
#endif
|
||||||
console->disable();
|
console->disable();
|
||||||
|
|
||||||
// Mouse is visible whenever we're not in game mode
|
// Mouse is visible whenever we're not in game mode
|
||||||
|
@ -124,7 +130,9 @@ void WindowManager::updateVisible()
|
||||||
// Show the windows we want
|
// Show the windows we want
|
||||||
map -> setVisible( eff & GW_Map );
|
map -> setVisible( eff & GW_Map );
|
||||||
stats -> setVisible( eff & GW_Stats );
|
stats -> setVisible( eff & GW_Stats );
|
||||||
|
#if 0
|
||||||
// inventory -> setVisible( eff & GW_Inventory );
|
// inventory -> setVisible( eff & GW_Inventory );
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,9 @@ namespace MWGui
|
||||||
MapWindow *map;
|
MapWindow *map;
|
||||||
MainMenu *menu;
|
MainMenu *menu;
|
||||||
StatsWindow *stats;
|
StatsWindow *stats;
|
||||||
|
#if 0
|
||||||
InventoryWindow *inventory;
|
InventoryWindow *inventory;
|
||||||
|
#endif
|
||||||
Console *console;
|
Console *console;
|
||||||
|
|
||||||
// Character creation
|
// Character creation
|
||||||
|
|
Loading…
Reference in a new issue