duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Organya dependency from platform backend

Browse source
This commit is contained in:
Clownacy 2020-09-08 03:36:11 +01:00
parent 633ac64641
commit bdcb1f3a3e
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Backends/Platform/GLFW3.cpp
View file

@ -15,7 +15,6 @@
#include "../Shared/GLFW3.h" #include "../Shared/GLFW3.h"
#include "../../Attributes.h" #include "../../Attributes.h"
#include "../../Main.h" #include "../../Main.h"
#include "../../Organya.h"
#include "../../Profile.h" #include "../../Profile.h"
#define DO_KEY(GLFW_KEY, BACKEND_KEY) \ #define DO_KEY(GLFW_KEY, BACKEND_KEY) \
@ -271,10 +270,7 @@ void PlaybackBackend_EnableDragAndDrop(void)
bool Backend_SystemTask(bool active) bool Backend_SystemTask(bool active)
{ {
if (glfwWindowShouldClose(window)) if (glfwWindowShouldClose(window))
{
StopOrganyaMusic();
return false; return false;
}
if (active) if (active)
glfwPollEvents(); glfwPollEvents();

2
src/Backends/Platform/SDL2.cpp
View file

@ -13,7 +13,6 @@
#include "../Shared/SDL2.h" #include "../Shared/SDL2.h"
#include "../../Attributes.h" #include "../../Attributes.h"
#include "../../Main.h" #include "../../Main.h"
#include "../../Organya.h"
#include "../../Profile.h" #include "../../Profile.h"
#define DO_KEY(SDL_KEY, BACKEND_KEY) \ #define DO_KEY(SDL_KEY, BACKEND_KEY) \
@ -294,7 +293,6 @@ bool Backend_SystemTask(bool active)
break; break;
case SDL_QUIT: case SDL_QUIT:
StopOrganyaMusic();
return false; return false;
case SDL_RENDER_TARGETS_RESET: case SDL_RENDER_TARGETS_RESET:

3
src/Main.cpp
View file

@ -388,7 +388,10 @@ BOOL SystemTask(void)
do do
{ {
if (!Backend_SystemTask(bActive)) if (!Backend_SystemTask(bActive))
{
StopOrganyaMusic();
return FALSE; return FALSE;
}
} while(!bActive); } while(!bActive);
bool keyboard_state[BACKEND_KEYBOARD_TOTAL]; bool keyboard_state[BACKEND_KEYBOARD_TOTAL];