mirror of
https://github.com/thepigeongenerator/tetris_clone.git
synced 2025-12-17 14:05:45 +01:00
fix: rotation feels rather funky.
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
#include "../game/time.h"
|
#include "../game/time.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
|
|
||||||
|
/* processes an incoming scancode, returns the associated movement data, or performs the close action directly */
|
||||||
__attribute__((const)) static int procscancode(SDL_Scancode code) {
|
__attribute__((const)) static int procscancode(SDL_Scancode code) {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
case SDL_SCANCODE_Q:
|
case SDL_SCANCODE_Q:
|
||||||
@@ -39,16 +40,23 @@ __attribute__((const)) static int procscancode(SDL_Scancode code) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int input_getdat(time_t time) {
|
int input_getdat(time_t time) {
|
||||||
static int movdat = 0;
|
static int movdat = 0, nmovdat = 0;
|
||||||
SDL_Event e;
|
SDL_Event e;
|
||||||
while (SDL_PollEvent(&e)) {
|
while (SDL_PollEvent(&e)) {
|
||||||
switch (e.type) {
|
switch (e.type) {
|
||||||
case SDL_QUIT: window_close(); break;
|
case SDL_QUIT: window_close(); break;
|
||||||
case SDL_KEYDOWN: movdat |= procscancode(e.key.keysym.scancode); break;
|
case SDL_KEYDOWN: movdat |= procscancode(e.key.keysym.scancode); break;
|
||||||
case SDL_KEYUP: movdat &= ~procscancode(e.key.keysym.scancode); break;
|
case SDL_KEYUP: nmovdat |= procscancode(e.key.keysym.scancode); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static time_t timeout = 0, timeout_roll = 0;
|
static time_t timeout = 0, timeout_roll = 0;
|
||||||
return movdat & (((MOVR | MOVL | MOVD) & -!!time_poll(time, 64, &timeout)) | ((MOVRL | MOVRR) & -!!time_poll(time, 128, &timeout_roll)));
|
int mask = 0;
|
||||||
|
mask |= ((MOVR | MOVL | MOVD) & -!!time_poll(time, 64, &timeout));
|
||||||
|
mask |= ((MOVRL | MOVRR) & -!!time_poll(time, 164, &timeout_roll));
|
||||||
|
|
||||||
|
int cmov = movdat & mask;
|
||||||
|
nmovdat &= movdat;
|
||||||
|
movdat &= ~(nmovdat & mask);
|
||||||
|
return cmov;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user