aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-05-13 14:36:04 -0700
committer1029chris <1029chris@gmail.com>2016-05-13 14:36:04 -0700
commit77a17383acc3e97fb67608e146166c8002e00335 (patch)
tree96e61239d06cf12a542502440aa16248199de567
parent54dc57c92a751a18d2ea11302b3bd7915c8a20b2 (diff)
Fix for chat messages coming after virus fights
-rw-r--r--system.lua2
-rw-r--r--virus1.lua1
2 files changed, 2 insertions, 1 deletions
diff --git a/system.lua b/system.lua
index 29a3b97..7aecdd8 100644
--- a/system.lua
+++ b/system.lua
@@ -6,7 +6,7 @@ function drawLayer(id)
end
function updateSystem(dt)
timeNoti(dt)
- if time >= msgstime[msg.c] and msgssent < msg.c then
+ if time >= msgstime[msg.c] and msgssent < msg.c and v1.yes == false and v1.complete == false then
sendMessage(1, msgs[msg.c])
msgssent = msgssent + 1
end
diff --git a/virus1.lua b/virus1.lua
index 64075c7..c9d1207 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -568,6 +568,7 @@ function drawVirusFight1()
antivirus.status = "Virus Defeated"
win[4].update = true
scene = 1
+ time = 0
elseif v1.c.chat.msgs == 53 then
virus1Lose = virus1Lose + 1
scene = 666