From 5920354ee9132b87cea62fed2d02fde789c1f8b8 Mon Sep 17 00:00:00 2001 From: ostanton Date: Sat, 5 Apr 2025 19:45:55 +0100 Subject: Include guards for MSVC to stop whining --- src/levels.c | 5 +++++ src/tick.c | 5 +++++ src/types.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/levels.c b/src/levels.c index 22ad76a..004d0d9 100644 --- a/src/levels.c +++ b/src/levels.c @@ -1,3 +1,6 @@ +#ifndef INCLUDE_LEVELS_C +#define INCLUDE_LEVELS_C + #include "all.c" typedef struct { @@ -35,3 +38,5 @@ static Level levels[] = { #undef _ #undef B #undef O + +#endif // INCLUDE_LEVELS_C diff --git a/src/tick.c b/src/tick.c index 8b8f731..4b255df 100644 --- a/src/tick.c +++ b/src/tick.c @@ -1,3 +1,6 @@ +#ifndef INCLUDE_TICK_C +#define INCLUDE_TICK_C + #include "all.c" static int isRed(int cell) { @@ -333,3 +336,5 @@ static void tick(Game *game, Arena a) { // TODO: Win conditions } } + +#endif // INCLUDE_TICK_C diff --git a/src/types.c b/src/types.c index cbd9315..fd8f9ee 100644 --- a/src/types.c +++ b/src/types.c @@ -1,3 +1,6 @@ +#ifndef INCLUDE_TYPES_C +#define INCLUDE_TYPES_C + #include "all.c" #define MEM_SIZE (1<<24) @@ -106,3 +109,5 @@ static void *alloc(Arena *a, ptrdiff_t count, ptrdiff_t size, ptrdiff_t align) { return r; } + +#endif // INCLUDE_TYPES_C -- cgit v1.2.3 From 93d39259cfed341102177f38da58aa249df20789 Mon Sep 17 00:00:00 2001 From: ostanton Date: Sat, 5 Apr 2025 20:03:28 +0100 Subject: Thinner sidebar, nice layout --- src/all.c | 9 +++++++-- src/types.c | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/all.c b/src/all.c index 028289c..d2536b9 100644 --- a/src/all.c +++ b/src/all.c @@ -89,9 +89,14 @@ static const Color colors[N_COLORS][4] = { }, }; +#define BUTTON_SIZE 32 +#define BUTTON_SPACING 16 +#define BUTTON_SPACER(i) (BUTTON_SPACING + (BUTTON_SIZE * (i) + (i) * BUTTON_SPACING)) + static const Button buttons[N_BUTTONS] = { - [BUTTON_RETRY] = {.x = 16, .y = 16, .w = 128, .h = 32}, - [BUTTON_BACK] = {.x = 16, .y = 48, .w = 128, .h = 32}, + [BUTTON_CONTINUE] = {.x = BUTTON_SPACING, .y = BUTTON_SPACER(BUTTON_CONTINUE), .w = BUTTON_SIZE, .h = BUTTON_SIZE}, + [BUTTON_RETRY] = {.x = BUTTON_SPACING, .y = BUTTON_SPACER(BUTTON_RETRY), .w = BUTTON_SIZE, .h = BUTTON_SIZE}, + [BUTTON_BACK] = {.x = BUTTON_SPACING, .y = BUTTON_SPACER(BUTTON_BACK), .w = BUTTON_SIZE, .h = BUTTON_SIZE}, }; static DrawList *render(State *state, UI *ui, Arena *a) { diff --git a/src/types.c b/src/types.c index fd8f9ee..8e8ba1d 100644 --- a/src/types.c +++ b/src/types.c @@ -7,7 +7,7 @@ #define GRIDWIDTH 20 #define GRIDHEIGHT 16 #define TICK_LENGTH 200 -#define GRID_OFFSET_X 256 +#define GRID_OFFSET_X 64 typedef struct { unsigned char r, g, b, a; @@ -47,6 +47,7 @@ enum { }; enum { + BUTTON_CONTINUE, BUTTON_RETRY, BUTTON_BACK, N_BUTTONS, -- cgit v1.2.3 From 3fba436a0b83cce81353e3b170621a1632d8b219 Mon Sep 17 00:00:00 2001 From: ostanton Date: Sat, 5 Apr 2025 20:05:21 +0100 Subject: Added more Visual Studio gitignore stuff --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 943dd63..a0be67f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ x64 *.vcxproj *.vcxproj.filters *.vcxproj.user +*.sln.DotSettings.user -- cgit v1.2.3