scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CreateSDL_Window rename, avoid macro conflict

Browse Source
This commit is contained in:
Justin Scofield
2023-11-24 22:12:30 -05:00
parent 9b52934ff4
commit b147d374f6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/controller.cc
View File

@@ -100,7 +100,7 @@ void HandleMouseMovement(int &wheel) {
bool Controller::IsActive() const { return active_; } bool Controller::IsActive() const { return active_; }
absl::Status Controller::OnEntry() { absl::Status Controller::OnEntry() {
RETURN_IF_ERROR(CreateWindow()) RETURN_IF_ERROR(CreateSDL_Window())
RETURN_IF_ERROR(CreateRenderer()) RETURN_IF_ERROR(CreateRenderer())
RETURN_IF_ERROR(CreateGuiContext()) RETURN_IF_ERROR(CreateGuiContext())
InitializeKeymap(); InitializeKeymap();
@@ -167,7 +167,7 @@ void Controller::OnExit() {
SDL_Quit(); SDL_Quit();
} }
absl::Status Controller::CreateWindow() { absl::Status Controller::CreateSDL_Window() {
if (SDL_Init(SDL_INIT_EVERYTHING) != 0) { if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
return absl::InternalError( return absl::InternalError(
absl::StrFormat("SDL_Init: %s\n", SDL_GetError())); absl::StrFormat("SDL_Init: %s\n", SDL_GetError()));

2
src/app/core/controller.h
View File

@@ -37,7 +37,7 @@ class Controller : public ExperimentFlags {
void operator()(SDL_Texture *p) const { SDL_DestroyTexture(p); } void operator()(SDL_Texture *p) const { SDL_DestroyTexture(p); }
}; };
absl::Status CreateWindow(); absl::Status CreateSDL_Window();
absl::Status CreateRenderer(); absl::Status CreateRenderer();
absl::Status CreateGuiContext(); absl::Status CreateGuiContext();
absl::Status LoadFontFamilies() const; absl::Status LoadFontFamilies() const;