Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

De-C++-ify struct ScreenSettings

Browse Source 
This includes:
- Removing the constructor in favor of actually being able to see that
  there's an actual function called being made initializing the struct
- Removing the use of a reference in Screen::init() in favor of using a
  pointer
- Adding the struct qualifier everywhere (it's not much typing),
  although technically you could typedef it in C, but I'd rather much
  not typedef just to remove a tag qualifier
This commit is contained in:
Misa
2021-12-25 00:18:51 -08:00
parent d0ffafe117
commit 1e157f3cc9
6 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
desktop_version/src/Screen.cpp
View File

@@ -20,27 +20,27 @@ extern "C"
);
}
ScreenSettings::ScreenSettings(void)
void ScreenSettings_default(struct ScreenSettings* _this)
{
windowWidth = 320;
windowHeight = 240;
fullscreen = false;
useVsync = true; // Now that uncapped is the default...
scalingMode = 0;
linearFilter = false;
badSignal = false;
_this->windowWidth = 320;
_this->windowHeight = 240;
_this->fullscreen = false;
_this->useVsync = true; // Now that uncapped is the default...
_this->scalingMode = 0;
_this->linearFilter = false;
_this->badSignal = false;
}
void Screen::init(const ScreenSettings& settings)
void Screen::init(const struct ScreenSettings* settings)
{
m_window = NULL;
m_renderer = NULL;
m_screenTexture = NULL;
m_screen = NULL;
isWindowed = !settings.fullscreen;
scalingMode = settings.scalingMode;
isFiltered = settings.linearFilter;
vsync = settings.useVsync;
isWindowed = !settings->fullscreen;
scalingMode = settings->scalingMode;
isFiltered = settings->linearFilter;
vsync = settings->useVsync;
SDL_SetHintWithPriority(
SDL_HINT_RENDER_SCALE_QUALITY,
@@ -85,9 +85,9 @@ void Screen::init(const ScreenSettings& settings)
240
);
badSignalEffect = settings.badSignal;
badSignalEffect = settings->badSignal;
ResizeScreen(settings.windowWidth, settings.windowHeight);
ResizeScreen(settings->windowWidth, settings->windowHeight);
}
void Screen::destroy(void)
@@ -105,7 +105,7 @@ void Screen::destroy(void)
#undef X
}
void Screen::GetSettings(ScreenSettings* settings)
void Screen::GetSettings(struct ScreenSettings* settings)
{
int width, height;
GetWindowSize(&width, &height);