From cd234dbc48fa259b7ca1379372c3c84d5c9feb86 Mon Sep 17 00:00:00 2001 From: Nicholas Hayashi Date: Wed, 14 Jul 2021 23:44:46 -0400 Subject: [PATCH] fix extra --- src/extra.lua | 2 +- src/game.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/extra.lua b/src/extra.lua index 33a197c..0277579 100644 --- a/src/extra.lua +++ b/src/extra.lua @@ -3,7 +3,7 @@ function fprofile(f, ...) local t1 = am.current_time() local result = { f(...) } log("%f", am.current_time() - t1) - return result + return unpack(result) end function math.wrapf(float, range) diff --git a/src/game.lua b/src/game.lua index 766aa27..2c3025d 100644 --- a/src/game.lua +++ b/src/game.lua @@ -3,6 +3,7 @@ game = false -- flag to tell if there is a game running state = {} -- top right display types +-- f1 toggles what is displayed in the top right of the screen local TRDTS = { NOTHING = 0, CENTERED_EVENQ = 1, @@ -95,7 +96,7 @@ end local function do_day_night_cycle() local tstep = (math.sin(state.time * am.delta_time) + 1) / 100 - --state.world"negative_mask".color = vec4(tstep){a=1} + state.world"negative_mask".color = vec4(tstep){a=1} end local function game_pause() @@ -262,7 +263,7 @@ local function game_action(scene) node.color = COLORS.CLARET node:action(am.tween(0.1, { color = COLORS.TRANSPARENT })) play_sfx(SOUNDS.BIRD2) - alert("not enough $$$$") + alert("not enough money") else update_money(-cost)