mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-25 03:40:40 +00:00
Remove unneeded window pointers
This commit is contained in:
scrawl
parent
f67dbc8aa0
commit
d10985e481
@ -141,37 +141,24 @@ namespace MWGui
|
|||||||
, mHud(NULL)
|
, mHud(NULL)
|
||||||
, mMap(NULL)
|
, mMap(NULL)
|
||||||
, mLocalMapRender(NULL)
|
, mLocalMapRender(NULL)
|
||||||
, mMenu(NULL)
|
|
||||||
, mToolTips(NULL)
|
, mToolTips(NULL)
|
||||||
, mStatsWindow(NULL)
|
, mStatsWindow(NULL)
|
||||||
, mMessageBoxManager(NULL)
|
, mMessageBoxManager(NULL)
|
||||||
, mConsole(NULL)
|
, mConsole(NULL)
|
||||||
, mDialogueWindow(NULL)
|
, mDialogueWindow(NULL)
|
||||||
, mContainerWindow(NULL)
|
|
||||||
, mDragAndDrop(NULL)
|
, mDragAndDrop(NULL)
|
||||||
, mInventoryWindow(NULL)
|
, mInventoryWindow(NULL)
|
||||||
, mScrollWindow(NULL)
|
, mScrollWindow(NULL)
|
||||||
, mBookWindow(NULL)
|
, mBookWindow(NULL)
|
||||||
, mCountDialog(NULL)
|
, mCountDialog(NULL)
|
||||||
, mTradeWindow(NULL)
|
, mTradeWindow(NULL)
|
||||||
, mSpellBuyingWindow(NULL)
|
|
||||||
, mTravelWindow(NULL)
|
|
||||||
, mSettingsWindow(NULL)
|
, mSettingsWindow(NULL)
|
||||||
, mConfirmationDialog(NULL)
|
, mConfirmationDialog(NULL)
|
||||||
, mAlchemyWindow(NULL)
|
|
||||||
, mSpellWindow(NULL)
|
, mSpellWindow(NULL)
|
||||||
, mQuickKeysMenu(NULL)
|
, mQuickKeysMenu(NULL)
|
||||||
, mLoadingScreen(NULL)
|
, mLoadingScreen(NULL)
|
||||||
, mLevelupDialog(NULL)
|
|
||||||
, mWaitDialog(NULL)
|
, mWaitDialog(NULL)
|
||||||
, mSpellCreationDialog(NULL)
|
|
||||||
, mEnchantingDialog(NULL)
|
|
||||||
, mTrainingWindow(NULL)
|
|
||||||
, mMerchantRepair(NULL)
|
|
||||||
, mSoulgemDialog(NULL)
|
, mSoulgemDialog(NULL)
|
||||||
, mRepair(NULL)
|
|
||||||
, mRecharge(NULL)
|
|
||||||
, mCompanionWindow(NULL)
|
|
||||||
, mVideoBackground(NULL)
|
, mVideoBackground(NULL)
|
||||||
, mVideoWidget(NULL)
|
, mVideoWidget(NULL)
|
||||||
, mWerewolfFader(NULL)
|
, mWerewolfFader(NULL)
|
||||||
@ -319,13 +306,13 @@ namespace MWGui
|
|||||||
|
|
||||||
mDragAndDrop = new DragAndDrop();
|
mDragAndDrop = new DragAndDrop();
|
||||||
|
|
||||||
mRecharge = new Recharge();
|
Recharge* recharge = new Recharge();
|
||||||
mGuiModeStates[GM_Recharge] = GuiModeState(mRecharge);
|
mGuiModeStates[GM_Recharge] = GuiModeState(recharge);
|
||||||
mWindows.push_back(mRecharge);
|
mWindows.push_back(recharge);
|
||||||
|
|
||||||
mMenu = new MainMenu(w, h, mResourceSystem->getVFS(), mVersionDescription);
|
MainMenu* menu = new MainMenu(w, h, mResourceSystem->getVFS(), mVersionDescription);
|
||||||
mGuiModeStates[GM_MainMenu] = GuiModeState(mMenu);
|
mGuiModeStates[GM_MainMenu] = GuiModeState(menu);
|
||||||
mWindows.push_back(mMenu);
|
mWindows.push_back(menu);
|
||||||
|
|
||||||
mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup());
|
mLocalMapRender = new MWRender::LocalMap(mViewer->getSceneData()->asGroup());
|
||||||
mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue);
|
mMap = new MapWindow(mCustomMarkers, mDragAndDrop, mLocalMapRender, mWorkQueue);
|
||||||
@ -367,23 +354,23 @@ namespace MWGui
|
|||||||
|
|
||||||
mMessageBoxManager = new MessageBoxManager(mStore->get<ESM::GameSetting>().find("fMessageTimePerChar")->getFloat());
|
mMessageBoxManager = new MessageBoxManager(mStore->get<ESM::GameSetting>().find("fMessageTimePerChar")->getFloat());
|
||||||
|
|
||||||
mSpellBuyingWindow = new SpellBuyingWindow();
|
SpellBuyingWindow* spellBuyingWindow = new SpellBuyingWindow();
|
||||||
mWindows.push_back(mSpellBuyingWindow);
|
mWindows.push_back(spellBuyingWindow);
|
||||||
mGuiModeStates[GM_SpellBuying] = GuiModeState(mSpellBuyingWindow);
|
mGuiModeStates[GM_SpellBuying] = GuiModeState(spellBuyingWindow);
|
||||||
|
|
||||||
mTravelWindow = new TravelWindow();
|
TravelWindow* travelWindow = new TravelWindow();
|
||||||
mWindows.push_back(mTravelWindow);
|
mWindows.push_back(travelWindow);
|
||||||
mGuiModeStates[GM_Travel] = GuiModeState(mTravelWindow);
|
mGuiModeStates[GM_Travel] = GuiModeState(travelWindow);
|
||||||
|
|
||||||
mDialogueWindow = new DialogueWindow();
|
mDialogueWindow = new DialogueWindow();
|
||||||
mWindows.push_back(mDialogueWindow);
|
mWindows.push_back(mDialogueWindow);
|
||||||
trackWindow(mDialogueWindow, "dialogue");
|
trackWindow(mDialogueWindow, "dialogue");
|
||||||
mGuiModeStates[GM_Dialogue] = GuiModeState(mDialogueWindow);
|
mGuiModeStates[GM_Dialogue] = GuiModeState(mDialogueWindow);
|
||||||
|
|
||||||
mContainerWindow = new ContainerWindow(mDragAndDrop);
|
ContainerWindow* containerWindow = new ContainerWindow(mDragAndDrop);
|
||||||
mWindows.push_back(mContainerWindow);
|
mWindows.push_back(containerWindow);
|
||||||
trackWindow(mContainerWindow, "container");
|
trackWindow(containerWindow, "container");
|
||||||
mGuiModeStates[GM_Container] = GuiModeState({mContainerWindow, mInventoryWindow});
|
mGuiModeStates[GM_Container] = GuiModeState({containerWindow, mInventoryWindow});
|
||||||
|
|
||||||
mHud = new HUD(mCustomMarkers, mDragAndDrop, mLocalMapRender);
|
mHud = new HUD(mCustomMarkers, mDragAndDrop, mLocalMapRender);
|
||||||
mWindows.push_back(mHud);
|
mWindows.push_back(mHud);
|
||||||
@ -412,49 +399,49 @@ namespace MWGui
|
|||||||
mConfirmationDialog = new ConfirmationDialog();
|
mConfirmationDialog = new ConfirmationDialog();
|
||||||
mWindows.push_back(mConfirmationDialog);
|
mWindows.push_back(mConfirmationDialog);
|
||||||
|
|
||||||
mAlchemyWindow = new AlchemyWindow();
|
AlchemyWindow* alchemyWindow = new AlchemyWindow();
|
||||||
mWindows.push_back(mAlchemyWindow);
|
mWindows.push_back(alchemyWindow);
|
||||||
trackWindow(mAlchemyWindow, "alchemy");
|
trackWindow(alchemyWindow, "alchemy");
|
||||||
mGuiModeStates[GM_Alchemy] = GuiModeState(mAlchemyWindow);
|
mGuiModeStates[GM_Alchemy] = GuiModeState(alchemyWindow);
|
||||||
|
|
||||||
mQuickKeysMenu = new QuickKeysMenu();
|
mQuickKeysMenu = new QuickKeysMenu();
|
||||||
mWindows.push_back(mQuickKeysMenu);
|
mWindows.push_back(mQuickKeysMenu);
|
||||||
mGuiModeStates[GM_QuickKeysMenu] = GuiModeState(mQuickKeysMenu);
|
mGuiModeStates[GM_QuickKeysMenu] = GuiModeState(mQuickKeysMenu);
|
||||||
|
|
||||||
mLevelupDialog = new LevelupDialog();
|
LevelupDialog* levelupDialog = new LevelupDialog();
|
||||||
mWindows.push_back(mLevelupDialog);
|
mWindows.push_back(levelupDialog);
|
||||||
mGuiModeStates[GM_Levelup] = GuiModeState(mLevelupDialog);
|
mGuiModeStates[GM_Levelup] = GuiModeState(levelupDialog);
|
||||||
|
|
||||||
mWaitDialog = new WaitDialog();
|
mWaitDialog = new WaitDialog();
|
||||||
mWindows.push_back(mWaitDialog);
|
mWindows.push_back(mWaitDialog);
|
||||||
mGuiModeStates[GM_Rest] = GuiModeState(mWaitDialog);
|
mGuiModeStates[GM_Rest] = GuiModeState(mWaitDialog);
|
||||||
|
|
||||||
mSpellCreationDialog = new SpellCreationDialog();
|
SpellCreationDialog* spellCreationDialog = new SpellCreationDialog();
|
||||||
mWindows.push_back(mSpellCreationDialog);
|
mWindows.push_back(spellCreationDialog);
|
||||||
mGuiModeStates[GM_SpellCreation] = GuiModeState(mSpellCreationDialog);
|
mGuiModeStates[GM_SpellCreation] = GuiModeState(spellCreationDialog);
|
||||||
|
|
||||||
mEnchantingDialog = new EnchantingDialog();
|
EnchantingDialog* enchantingDialog = new EnchantingDialog();
|
||||||
mWindows.push_back(mEnchantingDialog);
|
mWindows.push_back(enchantingDialog);
|
||||||
mGuiModeStates[GM_Enchanting] = GuiModeState(mEnchantingDialog);
|
mGuiModeStates[GM_Enchanting] = GuiModeState(enchantingDialog);
|
||||||
|
|
||||||
mTrainingWindow = new TrainingWindow();
|
TrainingWindow* trainingWindow = new TrainingWindow();
|
||||||
mWindows.push_back(mTrainingWindow);
|
mWindows.push_back(trainingWindow);
|
||||||
mGuiModeStates[GM_Training] = GuiModeState(mTrainingWindow);
|
mGuiModeStates[GM_Training] = GuiModeState(trainingWindow);
|
||||||
|
|
||||||
mMerchantRepair = new MerchantRepair();
|
MerchantRepair* merchantRepair = new MerchantRepair();
|
||||||
mWindows.push_back(mMerchantRepair);
|
mWindows.push_back(merchantRepair);
|
||||||
mGuiModeStates[GM_MerchantRepair] = GuiModeState(mMerchantRepair);
|
mGuiModeStates[GM_MerchantRepair] = GuiModeState(merchantRepair);
|
||||||
|
|
||||||
mRepair = new Repair();
|
Repair* repair = new Repair();
|
||||||
mWindows.push_back(mRepair);
|
mWindows.push_back(repair);
|
||||||
mGuiModeStates[GM_Repair] = GuiModeState(mRepair);
|
mGuiModeStates[GM_Repair] = GuiModeState(repair);
|
||||||
|
|
||||||
mSoulgemDialog = new SoulgemDialog(mMessageBoxManager);
|
mSoulgemDialog = new SoulgemDialog(mMessageBoxManager);
|
||||||
|
|
||||||
mCompanionWindow = new CompanionWindow(mDragAndDrop, mMessageBoxManager);
|
CompanionWindow* companionWindow = new CompanionWindow(mDragAndDrop, mMessageBoxManager);
|
||||||
mWindows.push_back(mCompanionWindow);
|
mWindows.push_back(companionWindow);
|
||||||
trackWindow(mCompanionWindow, "companion");
|
trackWindow(companionWindow, "companion");
|
||||||
mGuiModeStates[GM_Companion] = GuiModeState({mInventoryWindow, mCompanionWindow});
|
mGuiModeStates[GM_Companion] = GuiModeState({mInventoryWindow, companionWindow});
|
||||||
|
|
||||||
mJailScreen = new JailScreen();
|
mJailScreen = new JailScreen();
|
||||||
mWindows.push_back(mJailScreen);
|
mWindows.push_back(mJailScreen);
|
||||||
|
|||||||
@ -405,37 +405,24 @@ namespace MWGui
|
|||||||
HUD *mHud;
|
HUD *mHud;
|
||||||
MapWindow *mMap;
|
MapWindow *mMap;
|
||||||
MWRender::LocalMap* mLocalMapRender;
|
MWRender::LocalMap* mLocalMapRender;
|
||||||
MainMenu *mMenu;
|
|
||||||
ToolTips *mToolTips;
|
ToolTips *mToolTips;
|
||||||
StatsWindow *mStatsWindow;
|
StatsWindow *mStatsWindow;
|
||||||
MessageBoxManager *mMessageBoxManager;
|
MessageBoxManager *mMessageBoxManager;
|
||||||
Console *mConsole;
|
Console *mConsole;
|
||||||
DialogueWindow *mDialogueWindow;
|
DialogueWindow *mDialogueWindow;
|
||||||
ContainerWindow *mContainerWindow;
|
|
||||||
DragAndDrop* mDragAndDrop;
|
DragAndDrop* mDragAndDrop;
|
||||||
InventoryWindow *mInventoryWindow;
|
InventoryWindow *mInventoryWindow;
|
||||||
ScrollWindow* mScrollWindow;
|
ScrollWindow* mScrollWindow;
|
||||||
BookWindow* mBookWindow;
|
BookWindow* mBookWindow;
|
||||||
CountDialog* mCountDialog;
|
CountDialog* mCountDialog;
|
||||||
TradeWindow* mTradeWindow;
|
TradeWindow* mTradeWindow;
|
||||||
SpellBuyingWindow* mSpellBuyingWindow;
|
|
||||||
TravelWindow* mTravelWindow;
|
|
||||||
SettingsWindow* mSettingsWindow;
|
SettingsWindow* mSettingsWindow;
|
||||||
ConfirmationDialog* mConfirmationDialog;
|
ConfirmationDialog* mConfirmationDialog;
|
||||||
AlchemyWindow* mAlchemyWindow;
|
|
||||||
SpellWindow* mSpellWindow;
|
SpellWindow* mSpellWindow;
|
||||||
QuickKeysMenu* mQuickKeysMenu;
|
QuickKeysMenu* mQuickKeysMenu;
|
||||||
LoadingScreen* mLoadingScreen;
|
LoadingScreen* mLoadingScreen;
|
||||||
LevelupDialog* mLevelupDialog;
|
|
||||||
WaitDialog* mWaitDialog;
|
WaitDialog* mWaitDialog;
|
||||||
SpellCreationDialog* mSpellCreationDialog;
|
|
||||||
EnchantingDialog* mEnchantingDialog;
|
|
||||||
TrainingWindow* mTrainingWindow;
|
|
||||||
MerchantRepair* mMerchantRepair;
|
|
||||||
SoulgemDialog* mSoulgemDialog;
|
SoulgemDialog* mSoulgemDialog;
|
||||||
Repair* mRepair;
|
|
||||||
Recharge* mRecharge;
|
|
||||||
CompanionWindow* mCompanionWindow;
|
|
||||||
MyGUI::ImageBox* mVideoBackground;
|
MyGUI::ImageBox* mVideoBackground;
|
||||||
VideoWidget* mVideoWidget;
|
VideoWidget* mVideoWidget;
|
||||||
ScreenFader* mWerewolfFader;
|
ScreenFader* mWerewolfFader;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user