From 7d1ac518b514a4debc2ee883254de17aa4747a71 Mon Sep 17 00:00:00 2001 From: kdx Date: Sat, 18 Feb 2023 01:49:07 +0100 Subject: waitaminute --- commands.c | 45 ++++++++++++++++++++++++++++++++++++++------- commands.h | 3 ++- main.c | 3 ++- res/wait.bmp | Bin 0 -> 1674 bytes 4 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 res/wait.bmp diff --git a/commands.c b/commands.c index df51035..d93e3ad 100644 --- a/commands.c +++ b/commands.c @@ -3,7 +3,7 @@ #include "cfg.h" #include -int mouse_x, mouse_y, hovered = -1, editing = -1; +int mouse_x, mouse_y, hovered = -1, editing = -1, hovered_instr = -1; static const unsigned int commands[COM_LEN] = { COM_RIGHT, @@ -11,23 +11,38 @@ static const unsigned int commands[COM_LEN] = { COM_UP, COM_DOWN, COM_LEFT, + COM_NOOP, COM_LEFT, COM_DOWN, COM_UP }; +static const unsigned int instructions[_COM_COUNT][2] = { + {COM_LEFT, COM_NOOP}, + {COM_RIGHT, COM_NOOP}, + {COM_UP, COM_NOOP}, + {COM_DOWN, COM_NOOP}, + {COM_NOOP, COM_NOOP}, +}; + void commands_update(void) { LZR_MousePosition(&mouse_x, &mouse_y); hovered = -1; + hovered_instr = -1; + const int y = (mouse_y - CFG_TSIZE / 2) / (int)(CFG_TSIZE * 1.5); if (mouse_x > CFG_TSIZE / 2 && mouse_x <= CFG_TSIZE * 2.5) { - int y = (mouse_y - CFG_TSIZE / 2) / (int)(CFG_TSIZE * 1.5); if (y < 0 || y >= COM_LEN) return; hovered = y; if (LZR_BUTTON(MOUSE_L)) editing = commands[y]; } + if (mouse_x > CFG_DWIDTH - CFG_TSIZE * 2.5) { + if (y < 0 || y > 1) + return; + hovered_instr = y; + } } void commands_draw(void) @@ -36,11 +51,27 @@ void commands_draw(void) const int dx = CFG_TSIZE / 2; const int dy = CFG_TSIZE / 2 + i * (int)(CFG_TSIZE * 1.5); const int cmd = commands[i]; - const int blink = hovered != i || (LZR_GetTick() & 1); - if (cmd == editing) + const int blink = hovered == i || (LZR_GetTick() & 1); + if (!blink) + ; + else if (cmd == editing) { LZR_DrawSetColor(rand() & 1, rand() & 1, rand() & 1, 1); - else - LZR_DrawSetColor(blink, blink, blink, 1); - LZR_DrawImage(cmd, dx, dy); + LZR_DrawImage(cmd, dx, dy); + } else { + LZR_DrawSetColor(1, 1, 1, 1); + LZR_DrawImage(cmd, dx, dy); + } + } + if (editing != -1) { + const int dx = CFG_DWIDTH - CFG_TSIZE * 2.5; + for (int i = 0; i < 2; i++) { + const int dy = CFG_TSIZE / 2 + i * (int)(CFG_TSIZE * 1.5); + const int instr = instructions[editing][i]; + const int blink = hovered_instr == i || (LZR_GetTick() & 1); + if (!blink) + continue; + LZR_DrawSetColor(1, 1, 1, 1); + LZR_DrawImage(instr, dx, dy); + } } } diff --git a/commands.h b/commands.h index 8a832b6..ccd48e4 100644 --- a/commands.h +++ b/commands.h @@ -5,11 +5,12 @@ enum { COM_RIGHT, COM_UP, COM_DOWN, + COM_NOOP, _COM_COUNT }; enum { - COM_LEN = 8 + COM_LEN = 9 }; void commands_update(void); diff --git a/main.c b/main.c index f4dcf38..cebcd0b 100644 --- a/main.c +++ b/main.c @@ -17,7 +17,8 @@ int main(int argc, char **argv) if (LZR_ImageLoad("res/left.bmp") < 0 || LZR_ImageLoad("res/right.bmp") < 0 || LZR_ImageLoad("res/up.bmp") < 0 || - LZR_ImageLoad("res/down.bmp") < 0) + LZR_ImageLoad("res/down.bmp") < 0 || + LZR_ImageLoad("res/wait.bmp") < 0) return LZR_Quit(), 1; while (!LZR_ShouldQuit()) { LZR_CycleEvents(); diff --git a/res/wait.bmp b/res/wait.bmp new file mode 100644 index 0000000..ac98f0e Binary files /dev/null and b/res/wait.bmp differ -- cgit v1.2.3