zv0n/game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tetris: make playable on macOS

Browse Source
This commit is contained in:
zv0n 2020-10-20 11:04:07 +02:00
parent 13d18d071f
commit 5ec4182519
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tetris/Makefile
View File

@ -1,5 +1,5 @@
CXX ?= g++ CXX ?= g++
CFLAGS ?= -O2 -Wall -Wextra CFLAGS ?= -O2 -Wall -Wextra -std=c++14
PREFIX ?= /usr/local/bin PREFIX ?= /usr/local/bin
LDFLAGS ?= -lSDL2 -lSDL2_image -lSDL2_gfx -lSDL2_ttf -pthread LDFLAGS ?= -lSDL2 -lSDL2_image -lSDL2_gfx -lSDL2_ttf -pthread

12
tetris/scenes.cpp
View File

@ -389,7 +389,8 @@ void handleKeyUpMain( SDL_Keycode key ) {
void pollEventsMain( SDLPP::Scene &scene ) { void pollEventsMain( SDLPP::Scene &scene ) {
SDL_Event event; SDL_Event event;
while ( SDL_PollEvent( &event ) != 0 ) { while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
switch ( event.type ) { switch ( event.type ) {
case SDL_QUIT: case SDL_QUIT:
quitGame(); quitGame();
@ -501,7 +502,8 @@ void handleKeyDownMenu( SDL_Keycode key ) {
void pollEventsMenu() { void pollEventsMenu() {
SDL_Event event; SDL_Event event;
while ( SDL_PollEvent( &event ) != 0 ) { while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
switch ( event.type ) { switch ( event.type ) {
case SDL_QUIT: case SDL_QUIT:
quitGame(); quitGame();
@ -566,7 +568,8 @@ void handleKeyDownGameOver( SDL_Keycode key ) {
void pollEventsGameOver() { void pollEventsGameOver() {
SDL_Event event; SDL_Event event;
while ( SDL_PollEvent( &event ) != 0 ) { while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
switch ( event.type ) { switch ( event.type ) {
case SDL_QUIT: case SDL_QUIT:
quitGame(); quitGame();
@ -689,7 +692,8 @@ void handleKeyDownOptions( SDL_Keycode key ) {
void pollEventsOptions() { void pollEventsOptions() {
SDL_Event event; SDL_Event event;
while ( SDL_PollEvent( &event ) != 0 ) { while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
switch ( event.type ) { switch ( event.type ) {
case SDL_QUIT: case SDL_QUIT:
quitGame(); quitGame();