From b7a67ab1e962ebc03b297f0ca220a0a97b8c5c3a Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 22 Jul 2022 02:29:23 -0700 Subject: [PATCH] bugfix: online help Broken in the commit before last. --- drawing.lua | 4 ++-- help.lua | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drawing.lua b/drawing.lua index 8d94bdd..180e0a7 100644 --- a/drawing.lua +++ b/drawing.lua @@ -19,13 +19,13 @@ function Drawing.draw(State, line_index, y) end if App.mouse_down(1) and love.keyboard.isDown('h') then - draw_help_with_mouse_pressed(State, line) + draw_help_with_mouse_pressed(State, line_index) return end end if line.show_help then - draw_help_without_mouse_pressed(State, line) + draw_help_without_mouse_pressed(State, line_index) return end diff --git a/help.lua b/help.lua index 91fe596..2abeb00 100644 --- a/help.lua +++ b/help.lua @@ -1,6 +1,8 @@ -function draw_help_without_mouse_pressed(State, drawing) +function draw_help_without_mouse_pressed(State, drawing_index) + local drawing = State.lines[drawing_index] + local line_cache = State.line_cache[drawing_index] App.color(Help_color) - local y = drawing.y+10 + local y = line_cache.starty+10 love.graphics.print("Things you can do:", State.left+30,y) y = y + State.line_height love.graphics.print("* Press the mouse button to start drawing a "..current_shape(State), State.left+30,y) @@ -46,12 +48,14 @@ function draw_help_without_mouse_pressed(State, drawing) love.graphics.print("Press 'esc' now to hide this message", State.left+30,y) y = y + State.line_height App.color(Help_background_color) - love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y)) + love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty)) end -function draw_help_with_mouse_pressed(State, drawing) +function draw_help_with_mouse_pressed(State, drawing_index) + local drawing = State.lines[drawing_index] + local line_cache = State.line_cache[drawing_index] App.color(Help_color) - local y = drawing.y+10 + local y = line_cache.starty+10 love.graphics.print("You're currently drawing a "..current_shape(State, drawing.pending), State.left+30,y) y = y + State.line_height love.graphics.print('Things you can do now:', State.left+30,y) @@ -125,7 +129,7 @@ function draw_help_with_mouse_pressed(State, drawing) y = y + State.line_height end App.color(Help_background_color) - love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y)) + love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty)) end function current_shape(State, shape)