JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

Treballant en la conversió a SDL3

Browse Source
This commit is contained in:
Raimon Zamora
2024-11-06 13:49:44 +01:00
parent b31a578731
commit 22619cf207
29 changed files with 97 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/jgame.cpp
View File

@@ -2,7 +2,7 @@
#include "jdraw.h"
#include "jinput.h"
#include "jaudio.h"
#include <SDL2/SDL.h>
#include <SDL3/SDL.h>
namespace game
{
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
game::param_count = argc;
game::params = argv;
SDL_Init(SDL_INIT_EVERYTHING);
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_GAMEPAD);
input::init();
audio::init();
@@ -47,26 +47,26 @@ int main(int argc, char *argv[])
{
while(SDL_PollEvent(&e))
{
if (e.type==SDL_QUIT) { game::should_exit = true; break; }
if (e.type==SDL_KEYDOWN)
if (e.type==SDL_EVENT_QUIT) { game::should_exit = true; break; }
if (e.type==SDL_EVENT_KEY_DOWN)
{
input::updateKey(e.key.keysym.scancode);
input::updateKey(e.key.scancode);
}
if (e.type==SDL_KEYUP)
if (e.type==SDL_EVENT_KEY_UP)
{
input::updateKeypressed(e.key.keysym.scancode);
input::updateKeypressed(e.key.scancode);
}
if (e.type==SDL_MOUSEBUTTONUP)
if (e.type==SDL_EVENT_MOUSE_BUTTON_UP)
{
input::updateClk(e.button.button);
}
if (e.type==SDL_MOUSEWHEEL)
if (e.type==SDL_EVENT_MOUSE_WHEEL)
{
input::updateWheel(e.wheel.y);
}
if (e.type==SDL_CONTROLLERBUTTONDOWN) {
input::updatePadBtn(e.cbutton.button);
input::updatePadBtnPressed(e.cbutton.button);
if (e.type==SDL_EVENT_GAMEPAD_BUTTON_DOWN) {
input::updatePadBtn(e.gbutton.button);
input::updatePadBtnPressed(e.gbutton.button);
}
}
@@ -78,8 +78,8 @@ int main(int argc, char *argv[])
input::updateKeypressed(SDL_SCANCODE_UNKNOWN);
input::updateClk(0);
input::updateWheel(0);
input::updatePadBtn(SDL_CONTROLLER_BUTTON_INVALID);
input::updatePadBtnPressed(SDL_CONTROLLER_BUTTON_INVALID);
input::updatePadBtn(SDL_GAMEPAD_BUTTON_INVALID);
input::updatePadBtnPressed(SDL_GAMEPAD_BUTTON_INVALID);
}
}