Skip to content

Commit

Permalink
Resolved #20
Browse files Browse the repository at this point in the history
  • Loading branch information
Tricky1975 committed Aug 31, 2017
1 parent 5f690ba commit cb0de0c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Make.blp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[rem]
Generated by: buildlove (BuildLove v17.08.25 - Make Love Not War!)
Thu 31 August 2017; 19:07:25
Thu 31 August 2017; 19:48:44

[vars]
DIR.AUTHOR./VOLUMES/SCYNDI/PROJECTS/APPLICATIONS/LOVE2D/GAMES/MORKER/RES/DEMO/DATA/ASH PIKACHU FONT=Ash Pikachu Font
Expand Down
6 changes: 5 additions & 1 deletion Script/EventChain.lll/EventChain.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
EventChain.lua
Version: 17.08.26
Version: 17.08.31
Copyright (C) 2017 Jeroen Petrus Broks
===========================
Expand Down Expand Up @@ -84,6 +84,10 @@ local function ec_exe(e)
local w
assert(eventchain,"Eventchain definition error")
if not eventchain.running then return end
if love.mouse.isDown(1) and love.mouse.isDown(2) and eventchain.skipable then
eventchain.running=#eventchain+1
StopTalking()
end
local ce = eventchain[eventchain.running]
if not ce then
-- likely the event has ended
Expand Down
14 changes: 12 additions & 2 deletions Script/Subs.lll/Talk.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
Talk.lua
Version: 17.08.26
Version: 17.08.31
Copyright (C) 2017 Jeroen Petrus Broks
===========================
Expand Down Expand Up @@ -44,6 +44,15 @@ local TalkFont = love.graphics.newFont( "FONTS/HIGHWAY.TTF", 20 )

talkconfig.PLAYER = talkconfig.KTHURA


function StopTalking()
if not talking then return end
local seg = talking.segs[talking.seg]
if not seg then return end
(talkfunctions[seg.tag:upper()] or talkfunctions.GEN).Stop(seg.tag)
talking=nil
end

local function TalkCallBack()
local seg = talking.segs[talking.seg]
if not seg then
Expand Down Expand Up @@ -72,6 +81,7 @@ local function TalkCallBack()
end



function Talk(base,tag)
if talking then return TalkCallBack() end
gamedata.data.VARS = gamedata.data.VARS or {}
Expand Down Expand Up @@ -146,4 +156,4 @@ function MapTalk(tag)
end


return {Talk=Talk,MapTalk=MapTalk}
return {Talk=Talk,MapTalk=MapTalk,StopTalking=StopTalking}

0 comments on commit cb0de0c

Please sign in to comment.