Worked more on chat, optimized code.

5 files changed, 38 insertions, 48 deletions

diff --git a/chat.lua b/chat.lua
index 91bc7f3..54fe179 100644
--- a/chat.lua
+++ b/chat.lua
@@ -19,15 +19,16 @@ function drawChat()
   love.graphics.draw(chat.profile, 6, 30)
   love.graphics.setColor(colors.font.dark)
   love.graphics.print(chat.profilename, 50, 41)
-  love.graphics.setColor(colors.font.friend)
-  if #msg.msgs <= 15 then
-    for i=1,#msg.msgs do
-      love.graphics.print("Friend: " .. msg.msgs[i], 12, 310 - (15*i))
-    end
-  elseif #msg.msgs >= 15 then
-    for i=1,15 do
-      love.graphics.print("Friend: " .. msg.msgs[i], 12, 310 - (15*i))
+  for i=1,chatlimit() do
+    if msg.msgs[i][1] == 1 then
+      love.graphics.setColor(colors.font.friend)
+      love.graphics.print("Friend:", 12, 310 - (28*i))
+    elseif msg.msgs[i][1] == 2 then
+      love.graphics.setColor(colors.font.you)
+      love.graphics.print("You:", 12, 310 - (28*i))
     end
+    love.graphics.setColor(colors.font.dark)
+    love.graphics.print("\n" .. msg.msgs[i][2], 12, 310 - (28*i))
   end
 end
 function updateChat()
@@ -36,5 +37,17 @@ function updateChat()
     msg.new = false
   end
 end
-function sendMessage(message)
+function sendMessage(id, message)
+  msg.new = true
+  table.insert(msg.msgs, 1, {id, message})
+  if win[1].ex == true or layer[1] ~= 1 then
+    notifyNow("CHAT NOTIFICATION", "New message from\nBest Friend:\n\n" .. message)
+  end
+end
+function chatlimit()
+  if #msg.msgs <=8 then
+    return #msg.msgs
+  else
+    return 8
+  end
 end
diff --git a/startmenu.lua b/startmenu.lua
index 61bac44..1fb85eb 100644
--- a/startmenu.lua
+++ b/startmenu.lua
@@ -36,12 +36,9 @@ function drawMenu()
   love.graphics.rectangle("fill", 0, 0, 30, 350)
   love.graphics.setColor(192, 192, 192)
   love.graphics.print("WINBLOWS 98 OR SOME SHIT", 11, 340, -1.5708)
-  drawMenuItems(1)
-  drawMenuItems(2)
-  drawMenuItems(3)
-  drawMenuItems(4)
-  drawMenuItems(5)
-  drawMenuItems(6)
+  for i=1,6 do
+    drawMenuItems(i)
+  end
   love.graphics.setCanvas()
   love.graphics.setColor(255,255,255)
   love.graphics.draw(start.cvs, start.x, start.y)
diff --git a/system.lua b/system.lua
index 5275380..ec2f134 100644
--- a/system.lua
+++ b/system.lua
@@ -22,20 +22,15 @@ function drawSystem()
       start.o = false
     elseif start.o == false then
       start.o = true
-      msg.new = true
-      table.insert(msg.msgs, 1, "HEY YOU")
+      sendMessage(1, "HEY WAZZUP FOOL")
     end
   end
   if start.o == true and sys.mouse.p.p == true and sys.mouse.p.x > 255 or sys.mouse.p.y < sys.h-380 then
     start.o = false
   end
-  drawLayer(7)
-  drawLayer(6)
-  drawLayer(5)
-  drawLayer(4)
-  drawLayer(3)
-  drawLayer(2)
-  drawLayer(1)
+  for i=1,7 do
+    drawLayer(8-i)
+  end
   drawStart()
   if start.o == true then
     drawMenu()
diff --git a/var.lua b/var.lua
index c3c4e1e..9a9de2b 100644
--- a/var.lua
+++ b/var.lua
@@ -104,6 +104,7 @@ function loadVar()
   colors.font = {}
   colors.font.dark = {50,50,50}
   colors.font.friend = {240,10,10}
+  colors.font.you = {10,10,240}
   notify = {}
   notify.yes = false
   notify.title = ""
diff --git a/window.lua b/window.lua
index d01cab6..f6c5cf9 100644
--- a/window.lua
+++ b/window.lua
@@ -164,12 +164,9 @@ function orderWindows()
     win[layer.sentToFront].layer = 1
     layer.sentToFront = 0
   end
-  closeWindow(1)
-  closeWindow(2)
-  closeWindow(3)
-  closeWindow(4)
-  closeWindow(5)
-  closeWindow(6)
+  for i=1,6 do
+    closeWindow(7-i)
+  end
   if layer[6] == 0 and layer[7] ~= 0 then
     layer[6] = layer[7]
     layer[7] = 0
@@ -194,24 +191,11 @@ function orderWindows()
     layer[1] = layer[2]
     layer[2] = 0
   end
-  setWindow(6)
-  setWindow(5)
-  setWindow(4)
-  setWindow(3)
-  setWindow(2)
-  setWindow(1)
-  setPanel(1)
-  setPanel(2)
-  setPanel(3)
-  setPanel(4)
-  setPanel(5)
-  setPanel(6)
-  drawWindow(1)
-  drawWindow(2)
-  drawWindow(3)
-  drawWindow(4)
-  drawWindow(5)
-  drawWindow(6)
+  for i=1,6 do
+    setWindow(7-i)
+    setPanel(7-i)
+    drawWindow(7-i)
+  end
 end
 function setWindow(id)
   if layer[id] ~= 0 then