From 926779aedd5e32dced5f8661d2eff356e84080f0 Mon Sep 17 00:00:00 2001 From: Madiwka3 Date: Tue, 1 Jun 2021 16:27:02 +0600 Subject: [PATCH] Fixed explosions --- main.lua | 14 +++++++++----- config.lua => save.lua | 0 src/baseGame.lua | 7 ------- 3 files changed, 9 insertions(+), 12 deletions(-) rename config.lua => save.lua (100%) diff --git a/main.lua b/main.lua index f1b4398..c134942 100644 --- a/main.lua +++ b/main.lua @@ -1,6 +1,10 @@ --CALLING OTHER LUA FILES + +love.filesystem.setIdentity( "pong" ) +love.filesystem.createDirectory( "a" ) require "src/dependencies" -io.stdout:setvbuf("no") + + --CANCELLED ATTEMPETED SHADING (NOT WORKING) local shader_code = [[ @@ -200,8 +204,8 @@ function controlChanger() end function love.load() walls = {} - print(love.filesystem.createDirectory( "pong" )) - love.filesystem.setIdentity( "pong" ) + + print (love.filesystem.getSaveDirectory()) print (love.filesystem.getIdentity( )) love.graphics.setDefaultFilter('nearest', 'nearest') @@ -216,9 +220,9 @@ function love.load() --print("Debug active") --load - testwalls = love.filesystem.load("save.lua")() + testwalls = love.filesystem.load("save") if testwalls ~= nil then - walls = love.filesystem.load("save.lua")() + walls = love.filesystem.load("save") print("Save file found") else print("No save file found!") diff --git a/config.lua b/save.lua similarity index 100% rename from config.lua rename to save.lua diff --git a/src/baseGame.lua b/src/baseGame.lua index d8c63e3..1c9b240 100644 --- a/src/baseGame.lua +++ b/src/baseGame.lua @@ -1649,13 +1649,6 @@ function menuDemo(dt) end end function effectControl() - if player1score > 0.8 * ptw or player2score > 0.8 * ptw then - for i = 1, maxBalls do - if math.abs(ball[i].x - VIRTUAL_WIDTH/2) < 10 and #explosions < 1 then - table.insert(explosions, explosion(love.math.random(100, VIRTUAL_WIDTH-100), love.math.random(player1.y, player2.y), 100, {player1.y/2.81/255,player2.y/2.81/255,ball[1].y/2.81/255,0.4})) - end - end - end for i, explosion in ipairs(explosions) do if explosion.killed then table.remove(explosions, i)