diff --git a/Editor/editing/_components/history/historyelementmainsetting.cpp b/Editor/editing/_components/history/historyelementmainsetting.cpp index bec263c25..9ebbed18f 100644 --- a/Editor/editing/_components/history/historyelementmainsetting.cpp +++ b/Editor/editing/_components/history/historyelementmainsetting.cpp @@ -5,23 +5,23 @@ #include #include -HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::WorldSettingSubType wldSubType, QObject *parent) : +HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::WorldSettingSubType wldSubType, QObject* parent) : QObject(parent), m_modWorldSetting(wldSubType) {} -HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::LevelSettingSubType lvlSubType, QObject *parent) : +HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::LevelSettingSubType lvlSubType, QObject* parent) : QObject(parent), m_modLevelSetting(lvlSubType) {} -HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::WorldSettingSubType wldSubType, QVariant extraData, QObject *parent) : +HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::WorldSettingSubType wldSubType, QVariant extraData, QObject* parent) : QObject(parent), m_modWorldSetting(wldSubType), m_modData(extraData) {} -HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::LevelSettingSubType lvlSubType, QVariant extraData, QObject *parent) : +HistoryElementMainSetting::HistoryElementMainSetting(HistorySettings::LevelSettingSubType lvlSubType, QVariant extraData, QObject* parent) : QObject(parent), m_modLevelSetting(lvlSubType), m_modData(extraData) @@ -32,11 +32,15 @@ HistoryElementMainSetting::~HistoryElementMainSetting() QString HistoryElementMainSetting::getHistoryName() { - if(qobject_cast(m_scene)){ + if(qobject_cast(m_scene)) + { return HistorySettings::settingToString(m_modLevelSetting); - }else if(qobject_cast(m_scene)){ + } + else if(qobject_cast(m_scene)) + { return HistorySettings::settingToString(m_modWorldSetting); } + return QString("Error History"); } @@ -44,12 +48,17 @@ void HistoryElementMainSetting::undo() { LvlScene* lvlScene = 0; WldScene* wldScene = 0; + if(!m_scene) return; - if((lvlScene = qobject_cast(m_scene))){ + + if((lvlScene = qobject_cast(m_scene))) + { processLevelUndo(); } - if((wldScene = qobject_cast(m_scene))){ + + if((wldScene = qobject_cast(m_scene))) + { processWorldUndo(); } } @@ -58,12 +67,17 @@ void HistoryElementMainSetting::redo() { LvlScene* lvlScene = 0; WldScene* wldScene = 0; + if(!m_scene) return; - if((lvlScene = qobject_cast(m_scene))){ + + if((lvlScene = qobject_cast(m_scene))) + { processLevelRedo(); } - if((wldScene = qobject_cast(m_scene))){ + + if((wldScene = qobject_cast(m_scene))) + { processWorldRedo(); } } @@ -74,26 +88,40 @@ void HistoryElementMainSetting::processWorldUndo() return; WldScene* wldScene = 0; + if(!(wldScene = qobject_cast(m_scene))) return; - if(m_modWorldSetting == HistorySettings::SETTING_HUB){ + if(m_modWorldSetting == HistorySettings::SETTING_HUB) + { wldScene->m_data->HubStyledWorld = !m_modData.toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_RESTARTAFTERFAIL){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_RESTARTAFTERFAIL) + { wldScene->m_data->restartlevel = !m_modData.toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_TOTALSTARS){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_TOTALSTARS) + { wldScene->m_data->stars = m_modData.toList()[0].toInt(); - }else if(m_modWorldSetting == HistorySettings::SETTING_INTROLEVEL){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_INTROLEVEL) + { wldScene->m_data->IntroLevel_file = m_modData.toList()[0].toString(); - }else if(m_modWorldSetting == HistorySettings::SETTING_CHARACTER){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_CHARACTER) + { int ind = MainWinConnect::pMainWin->configs.getCharacterI(m_modData.toList()[0].toInt()); - if(ind!=-1) + + if(ind != -1) wldScene->m_data->nocharacter[ind] = !m_modData.toList()[1].toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_WORLDTITLE){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_WORLDTITLE) + { wldScene->m_data->EpisodeTitle = m_modData.toList()[0].toString(); - if(MainWinConnect::pMainWin->activeChildWindow()==MainWindow::WND_World) + + if(MainWinConnect::pMainWin->activeChildWindow() == MainWindow::WND_World) MainWinConnect::pMainWin->activeWldEditWin()->setWindowTitle( - m_modData.toList()[0].toString() == "" ? MainWinConnect::pMainWin->activeWldEditWin()->userFriendlyCurrentFile() : m_modData.toList()[0].toString()); + m_modData.toList()[0].toString() == "" ? MainWinConnect::pMainWin->activeWldEditWin()->userFriendlyCurrentFile() : m_modData.toList()[0].toString()); } MainWinConnect::pMainWin->dock_WldSettingsBox->setCurrentWorldSettings(); @@ -105,15 +133,17 @@ void HistoryElementMainSetting::processLevelUndo() return; LvlScene* lvlScene = 0; + if(!(lvlScene = qobject_cast(m_scene))) return; - if(m_modLevelSetting == HistorySettings::SETTING_LEVELNAME){ + if(m_modLevelSetting == HistorySettings::SETTING_LEVELNAME) + { lvlScene->m_data->LevelName = m_modData.toList()[0].toString(); lvlScene->m_data->custom_params = m_modData.toList()[1].toString(); - MainWinConnect::pMainWin->activeLvlEditWin()->setWindowTitle( lvlScene->m_data->LevelName.isEmpty() ? - MainWinConnect::pMainWin->activeLvlEditWin()->userFriendlyCurrentFile() : lvlScene->m_data->LevelName ); + MainWinConnect::pMainWin->activeLvlEditWin()->setWindowTitle(lvlScene->m_data->LevelName.isEmpty() ? + MainWinConnect::pMainWin->activeLvlEditWin()->userFriendlyCurrentFile() : lvlScene->m_data->LevelName); MainWinConnect::pMainWin->updateWindowMenu(); } } @@ -124,26 +154,40 @@ void HistoryElementMainSetting::processWorldRedo() return; WldScene* wldScene = 0; + if(!(wldScene = qobject_cast(m_scene))) return; - if(m_modWorldSetting == HistorySettings::SETTING_HUB){ + if(m_modWorldSetting == HistorySettings::SETTING_HUB) + { wldScene->m_data->HubStyledWorld = m_modData.toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_RESTARTAFTERFAIL){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_RESTARTAFTERFAIL) + { wldScene->m_data->restartlevel = m_modData.toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_TOTALSTARS){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_TOTALSTARS) + { wldScene->m_data->stars = m_modData.toList()[1].toInt(); - }else if(m_modWorldSetting == HistorySettings::SETTING_INTROLEVEL){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_INTROLEVEL) + { wldScene->m_data->IntroLevel_file = m_modData.toList()[1].toString(); - }else if(m_modWorldSetting == HistorySettings::SETTING_CHARACTER){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_CHARACTER) + { int ind = MainWinConnect::pMainWin->configs.getCharacterI(m_modData.toList()[0].toInt()); - if(ind!=-1) + + if(ind != -1) wldScene->m_data->nocharacter[ind] = m_modData.toList()[1].toBool(); - }else if(m_modWorldSetting == HistorySettings::SETTING_WORLDTITLE){ + } + else if(m_modWorldSetting == HistorySettings::SETTING_WORLDTITLE) + { wldScene->m_data->EpisodeTitle = m_modData.toList()[1].toString(); - if(MainWinConnect::pMainWin->activeChildWindow()==MainWindow::WND_World) + + if(MainWinConnect::pMainWin->activeChildWindow() == MainWindow::WND_World) MainWinConnect::pMainWin->activeWldEditWin()->setWindowTitle( - m_modData.toList()[1].toString() == "" ? MainWinConnect::pMainWin->activeWldEditWin()->userFriendlyCurrentFile() : m_modData.toList()[1].toString()); + m_modData.toList()[1].toString() == "" ? MainWinConnect::pMainWin->activeWldEditWin()->userFriendlyCurrentFile() : m_modData.toList()[1].toString()); } MainWinConnect::pMainWin->dock_WldSettingsBox->setCurrentWorldSettings(); @@ -155,14 +199,16 @@ void HistoryElementMainSetting::processLevelRedo() return; LvlScene* lvlScene = 0; + if(!(lvlScene = qobject_cast(m_scene))) return; - if(m_modLevelSetting == HistorySettings::SETTING_LEVELNAME){ + if(m_modLevelSetting == HistorySettings::SETTING_LEVELNAME) + { lvlScene->m_data->LevelName = m_modData.toList()[2].toString(); lvlScene->m_data->custom_params = m_modData.toList()[3].toString(); - MainWinConnect::pMainWin->activeLvlEditWin()->setWindowTitle( lvlScene->m_data->LevelName.isEmpty() ? - MainWinConnect::pMainWin->activeLvlEditWin()->userFriendlyCurrentFile() : lvlScene->m_data->LevelName ); + MainWinConnect::pMainWin->activeLvlEditWin()->setWindowTitle(lvlScene->m_data->LevelName.isEmpty() ? + MainWinConnect::pMainWin->activeLvlEditWin()->userFriendlyCurrentFile() : lvlScene->m_data->LevelName); MainWinConnect::pMainWin->updateWindowMenu(); } }