summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2019-10-29 17:58:38 -0400
committerAndrew Opalach <andrew@akon.city> 2019-10-29 17:58:38 -0400
commit40ceaf1b7c43aa68cf76002bba9763b65a98e556 (patch)
treea4632e1084a0c1111e464165e9e1b870c3782cb3
parent0a96dc5bd5d13b250e11e80d3ed260b74b85c548 (diff)
downloadcetris-40ceaf1b7c43aa68cf76002bba9763b65a98e556.tar.gz
cetris-40ceaf1b7c43aa68cf76002bba9763b65a98e556.tar.bz2
cetris-40ceaf1b7c43aa68cf76002bba9763b65a98e556.zip
fix windows build
-rw-r--r--frontends/sdl/cetris_sdl.h22
-rw-r--r--frontends/sdl/sdl_ui.c22
m---------ini0
3 files changed, 22 insertions, 22 deletions
diff --git a/frontends/sdl/cetris_sdl.h b/frontends/sdl/cetris_sdl.h
index 8b41101..0f832e8 100644
--- a/frontends/sdl/cetris_sdl.h
+++ b/frontends/sdl/cetris_sdl.h
@@ -4,28 +4,6 @@ typedef struct {
SDL_Color text;
} color_scheme_t;
-color_scheme_t dark_mode = {
- .main = (SDL_Color){100, 100, 100, 255},
- .off = (SDL_Color){50, 50, 50, 255},
- .text = (SDL_Color){240, 240, 240, 255}
-};
-
-color_scheme_t light_mode = {
- .main = (SDL_Color){255, 255, 255, 255},
- .off = (SDL_Color){235, 235, 235, 255},
- .text = (SDL_Color){10, 10, 10, 255}
-};
-
-SDL_Color mino_colors[7] = {
- (SDL_Color){253,253,150,255}, // Yellow
- (SDL_Color){174,198,207,255}, // Aqua
- (SDL_Color){255,105,97,255}, // Red
- (SDL_Color){170,221,119,255}, // Olive
- (SDL_Color){255,179,71,255}, // Orange
- (SDL_Color){119,158,203,255}, // Navy
- (SDL_Color){177,156,217,255} // Purple
-};
-
typedef struct {
SDL_AudioSpec wav_spec;
uint32_t wav_length;
diff --git a/frontends/sdl/sdl_ui.c b/frontends/sdl/sdl_ui.c
index c8c90e8..fc9d113 100644
--- a/frontends/sdl/sdl_ui.c
+++ b/frontends/sdl/sdl_ui.c
@@ -28,6 +28,28 @@ SDL_Renderer* render;
SDL_Window *window;
SDL_Surface *screen;
+color_scheme_t dark_mode = {
+ .main = {100, 100, 100, 255},
+ .off = {50, 50, 50, 255},
+ .text = {240, 240, 240, 255}
+};
+
+color_scheme_t light_mode = {
+ .main = {255, 255, 255, 255},
+ .off = {235, 235, 235, 255},
+ .text = {10, 10, 10, 255}
+};
+
+SDL_Color mino_colors[7] = {
+ {253,253,150,255}, // Yellow
+ {174,198,207,255}, // Aqua
+ {255,105,97,255}, // Red
+ {170,221,119,255}, // Olive
+ {255,179,71,255}, // Orange
+ {119,158,203,255}, // Navy
+ {177,156,217,255} // Purple
+};
+
cetris_game g;
game_board_t main_board;
diff --git a/ini b/ini
-Subproject 9b15f721fd53b1beb8364f8763e2207963ac4fd
+Subproject 3401f2ed3153c6093c2f434e205cf6e7775a02d