Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit cb7476a

Browse files
committed
Remove native fullscreen mode related properties and methods
1 parent 6036e50 commit cb7476a

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

Managers/FrameMan.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@ namespace RTE {
216216
} else if (propName == "ResolutionY") {
217217
reader >> m_ResY;
218218
m_NewResY = m_ResY;
219-
} else if (propName == "Fullscreen") {
220-
reader >> m_Fullscreen;
221219
} else if (propName == "ResolutionMultiplier") {
222220
reader >> m_ResMultiplier;
223221
} else if (propName == "HSplitScreen") {
@@ -250,8 +248,6 @@ namespace RTE {
250248
writer << m_ResX;
251249
writer.NewProperty("ResolutionY");
252250
writer << m_ResY;
253-
writer.NewProperty("Fullscreen");
254-
writer << m_Fullscreen;
255251
writer.NewProperty("HSplitScreen");
256252
writer << m_HSplitOverride;
257253
writer.NewProperty("VSplitScreen");

Managers/SettingsMan.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ int SettingsMan::ReadProperty(std::string propName, Reader &reader)
140140
g_FrameMan.ReadProperty(propName, reader);
141141
else if (propName == "PaletteFile")
142142
g_FrameMan.ReadProperty(propName, reader);
143-
else if (propName == "Fullscreen")
144-
g_FrameMan.ReadProperty(propName, reader);
145143
else if (propName == "PixelsPerMeter")
146144
g_FrameMan.ReadProperty(propName, reader);
147145
else if (propName == "PlayIntro")
@@ -158,10 +156,6 @@ int SettingsMan::ReadProperty(std::string propName, Reader &reader)
158156
reader >> m_BlipOnRevealUnseen;
159157
else if (propName == "ShowForeignItems")
160158
reader >> m_ShowForeignItems;
161-
else if (propName == "ForceSoftwareGfxDriver")
162-
reader >> m_ForceSoftwareGfxDriver;
163-
else if (propName == "ForceSafeGfxDriver")
164-
reader >> m_ForceSafeGfxDriver;
165159
else if (propName == "ForceVirtualFullScreenGfxDriver")
166160
reader >> m_ForceVirtualFullScreenGfxDriver;
167161
else if (propName == "ForceOverlayedWindowGfxDriver")
@@ -330,8 +324,6 @@ int SettingsMan::Save(Writer &writer) const
330324
writer << g_FrameMan.ResolutionMultiplier();
331325
writer.NewProperty("PaletteFile");
332326
writer << g_FrameMan.GetPaletteFile();
333-
writer.NewProperty("Fullscreen");
334-
writer << g_FrameMan.IsFullscreen();
335327
writer.NewProperty("PixelsPerMeter");
336328
writer << g_FrameMan.GetPPM();
337329
writer.NewProperty("PlayIntro");
@@ -380,10 +372,6 @@ int SettingsMan::Save(Writer &writer) const
380372
writer << g_MovableMan.IsParticleSettlingEnabled();
381373
writer.NewProperty("EnableMOSubtraction");
382374
writer << g_MovableMan.IsMOSubtractionEnabled();
383-
writer.NewProperty("ForceSoftwareGfxDriver");
384-
writer << m_ForceSoftwareGfxDriver;
385-
writer.NewProperty("ForceSafeGfxDriver");
386-
writer << m_ForceSafeGfxDriver;
387375
writer.NewProperty("ForceVirtualFullScreenGfxDriver");
388376
writer << m_ForceVirtualFullScreenGfxDriver;
389377
writer.NewProperty("ForceOverlayedWindowGfxDriver");
@@ -519,8 +507,6 @@ int SettingsMan::SaveDefaults(Writer &writer) const
519507
writer.NewProperty("PaletteFile");
520508
ContentFile paletteFile("Base.rte/palette.bmp");
521509
writer << paletteFile;
522-
writer.NewProperty("Fullscreen");
523-
writer << 0;
524510
writer.NewProperty("PixelsPerMeter");
525511
writer << 20;
526512
writer.NewProperty("PlayIntro");

Managers/SettingsMan.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -415,28 +415,6 @@ class SettingsMan:
415415
float SoundPanningEffectStrength() const { return m_SoundPanningEffectStrength; }
416416

417417

418-
//////////////////////////////////////////////////////////////////////////////////////////
419-
// Method: ForceSoftwareGfxDriver
420-
//////////////////////////////////////////////////////////////////////////////////////////
421-
// Description: Whether we're told to use software driver via settings
422-
// Windows: GFX_DIRECTX_SOFT
423-
// Arguments: None.
424-
// Return value: true if forced to use software driver.
425-
426-
bool ForceSoftwareGfxDriver() const { return m_ForceSoftwareGfxDriver; }
427-
428-
429-
//////////////////////////////////////////////////////////////////////////////////////////
430-
// Method: ForceSafeGfxDriver
431-
//////////////////////////////////////////////////////////////////////////////////////////
432-
// Description: Whether we're told to use safe driver via settings. Overrides software driver.
433-
// Windows: GFX_DIRECTX_SAFE
434-
// Arguments: None.
435-
// Return value: true if forced to use software driver.
436-
437-
bool ForceSafeGfxDriver() const { return m_ForceSafeGfxDriver; }
438-
439-
440418
//////////////////////////////////////////////////////////////////////////////////////////
441419
// Method: ForceVirtualFullScreenGfxDriver
442420
//////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)