marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete effect level slider and configuration option

heavy-resources
Julius Michaelis 2014-04-03 23:02:00 +02:00
parent e5b7ef5b80
commit ccb6bfbc81
4 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config/C4Config.cpp
View File

@ -90,7 +90,6 @@ void C4ConfigGraphics::CompileFunc(StdCompiler *pComp)
pComp->Value(mkNamingAdapt(ShowStartupMessages, "ShowStartupMessages", 1 ,false, true));
pComp->Value(mkNamingAdapt(ColorAnimation, "ColorAnimation", 0 ,false, true));
pComp->Value(mkNamingAdapt(HighResLandscape, "HighResLandscape", 1 ,false, true));
pComp->Value(mkNamingAdapt(SmokeLevel, "SmokeLevel", 200 ,false, true));
pComp->Value(mkNamingAdapt(VerboseObjectLoading, "VerboseObjectLoading", 0 ));
pComp->Value(mkNamingAdapt(VideoModule, "VideoModule", 0 ,false, true));
pComp->Value(mkNamingAdapt(MenuTransparency, "MenuTransparency", 1 ,false, true));

1
src/config/C4Config.h
View File

@ -93,7 +93,6 @@ public:
int32_t VerboseObjectLoading;
int32_t ColorAnimation;
int32_t HighResLandscape;
int32_t SmokeLevel;
int32_t VideoModule;
int32_t MenuTransparency;
int32_t UpperBoard;

28
src/gui/C4StartupOptionsDlg.cpp
View File

@ -835,7 +835,7 @@ C4StartupOptionsDlg::C4StartupOptionsDlg() : C4StartupDlg(LoadResStrNoAmp("IDS_D
pGroupResolution->AddElement(pCombo);
// --subgroup options
iNumGfxOptions = 5, iOpt=0;
C4GUI::GroupBox *pGroupOptions = new C4GUI::GroupBox(caSheetGraphics.GetGridCell(0,2,1,2));
C4GUI::GroupBox *pGroupOptions = new C4GUI::GroupBox(caSheetGraphics.GetGridCell(0,1,1,2));
pGroupOptions->SetTitle(LoadResStrNoAmp("IDS_DLG_OPTIONS"));
pGroupOptions->SetFont(pUseFont);
pGroupOptions->SetColors(C4StartupEditBorderColor, C4StartupFontClr);
@ -886,27 +886,6 @@ C4StartupOptionsDlg::C4StartupOptionsDlg() : C4StartupDlg(LoadResStrNoAmp("IDS_D
pCheck->SetToolTip(LoadResStr("IDS_DESC_AUTOFRAMESKIP"));
pCheck->SetFont(pUseFont, C4StartupFontClr, C4StartupFontClrDisabled);
pGroupOptions->AddElement(pCheck);
// --subgroup effects
C4GUI::GroupBox *pGroupEffects = new C4GUI::GroupBox(caSheetGraphics.GetGridCell(1,2,1,2));
pGroupEffects->SetTitle(LoadResStrNoAmp("IDS_CTL_SMOKE"));
pGroupEffects->SetFont(pUseFont);
pGroupEffects->SetColors(C4StartupEditBorderColor, C4StartupFontClr);
pSheetGraphics->AddElement(pGroupEffects);
C4GUI::ComponentAligner caGroupEffects(pGroupEffects->GetClientRect(), iIndentX1, iIndentY2, true);
iNumGfxOptions = 1; iOpt=0;
// effects level slider
C4GUI::ComponentAligner caEffectsLevel(caGroupEffects.GetGridCell(0,1,iOpt++,iNumGfxOptions), 1,0,false);
StdStrBuf sEffectsTxt; sEffectsTxt.Copy(LoadResStr("IDS_CTL_SMOKELOW"));
w=20; q=12; pUseFont->GetTextExtent(sEffectsTxt.getData(), w,q, true);
pGroupEffects->AddElement(new C4GUI::Label(sEffectsTxt.getData(), caEffectsLevel.GetFromLeft(w,q), ACenter, C4StartupFontClr, pUseFont, false, false));
sEffectsTxt.Copy(LoadResStr("IDS_CTL_SMOKEHI"));
w=20; q=12; pUseFont->GetTextExtent(sEffectsTxt.getData(), w,q, true);
pGroupEffects->AddElement(new C4GUI::Label(sEffectsTxt.getData(), caEffectsLevel.GetFromRight(w,q), ACenter, C4StartupFontClr, pUseFont, false, false));
pEffectLevelSlider = new C4GUI::ScrollBar(caEffectsLevel.GetCentered(caEffectsLevel.GetInnerWidth(), C4GUI_ScrollBarHgt), true, new C4GUI::ParCallbackHandler<C4StartupOptionsDlg, int32_t>(this, &C4StartupOptionsDlg::OnEffectsSliderChange), 301);
pEffectLevelSlider->SetDecoration(&C4Startup::Get()->Graphics.sfctBookScroll, false);
pEffectLevelSlider->SetToolTip(LoadResStr("IDS_MSG_PARTICLES_DESC"));
pEffectLevelSlider->SetScrollPos(Config.Graphics.SmokeLevel);
pGroupEffects->AddElement(pEffectLevelSlider);
// --- page sound
C4GUI::ComponentAligner caSheetSound(pSheetSound->GetClientRect(), iIndentX1, iIndentY1, true);
@ -1444,11 +1423,6 @@ void C4StartupOptionsDlg::SaveGfxShader()
}
}
void C4StartupOptionsDlg::OnEffectsSliderChange(int32_t iNewVal)
{
Config.Graphics.SmokeLevel = iNewVal;
}
void C4StartupOptionsDlg::OnFEMusicCheck(C4GUI::Element *pCheckBox)
{
// option change is reflected immediately

2
src/gui/C4StartupOptionsDlg.h
View File

@ -137,11 +137,9 @@ private:
bool TryNewResolution(int32_t iResX, int32_t iResY);
StdStrBuf GetGfxResString(int32_t iResX, int32_t iResY); // convert resolution to string to be displayed in resolution choice combobox
const char * GetWindowedName(int32_t mode = -1);
void OnEffectsSliderChange(int32_t iNewVal);
C4GUI::CheckBox *pShaders;
int32_t iGfxTexIndent;
C4GUI::ScrollBar *pEffectLevelSlider;
void LoadGfxShader(); void SaveGfxShader();