summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2019-11-03 01:02:36 -0500
committerAndrew Opalach <andrew@akon.city> 2019-11-03 01:02:36 -0500
commit3a198c9b2aca247a3aa0a1bad0194733dbb93dd2 (patch)
treef125edf6c8960d4378eea13ecbc21c1ec748703f /frontends
parent36d4834de420d156aa669bd1b879941a55b8f1e6 (diff)
downloadcetris-3a198c9b2aca247a3aa0a1bad0194733dbb93dd2.tar.gz
cetris-3a198c9b2aca247a3aa0a1bad0194733dbb93dd2.tar.bz2
cetris-3a198c9b2aca247a3aa0a1bad0194733dbb93dd2.zip
use defines for constants
Diffstat (limited to 'frontends')
-rw-r--r--frontends/gl/main.c10
-rw-r--r--frontends/gl/meson.build2
-rw-r--r--frontends/gl/ui.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/frontends/gl/main.c b/frontends/gl/main.c
index 8eca628..f245932 100644
--- a/frontends/gl/main.c
+++ b/frontends/gl/main.c
@@ -19,11 +19,11 @@
#include "ui.h"
#include "events.h"
-static const int FRAME_RATE = 144;
-static const int SCREEN_FULLSCREEN = 0;
-static const int RES_SCALE = 2;
-static const int SCREEN_WIDTH = 900 * RES_SCALE;
-static const int SCREEN_HEIGHT = 720 * RES_SCALE;
+#define SCREEN_FULLSCREEN 0
+#define RES_SCALE 1.2
+#define SCREEN_WIDTH 900 * RES_SCALE
+#define SCREEN_HEIGHT 720 * RES_SCALE
+
static SDL_Window *window = NULL;
static SDL_GLContext maincontext;
diff --git a/frontends/gl/meson.build b/frontends/gl/meson.build
index c0f4d3e..3d31ac1 100644
--- a/frontends/gl/meson.build
+++ b/frontends/gl/meson.build
@@ -1,4 +1,4 @@
-src = ['events.c', 'audio.c', 'ui.c', 'skin.c', 'drawable.c', 'shader.c', 'main.c', 'glad/src/glad.c']
+src = ['main.c', 'events.c', 'audio.c', 'ui.c', 'skin.c', 'drawable.c', 'shader.c', 'glad/src/glad.c']
inc = [cetris_inc, include_directories('glad/include')]
deps = [cetris]
diff --git a/frontends/gl/ui.c b/frontends/gl/ui.c
index 0dadf4e..d005ac8 100644
--- a/frontends/gl/ui.c
+++ b/frontends/gl/ui.c
@@ -4,7 +4,7 @@
#include "ui.h"
#include "drawable.h"
-static const int RES_SCALE = 2;
+#define RES_SCALE 1.2
void load_tetris_board(cetris_ui *ui, tetris_board_t *board, GLfloat x, GLfloat y, GLfloat w, GLfloat h) {
board->block_width = w / (GLfloat)board->game.config.board_x;