Correct accidental use of global vars

This commit is contained in:
ListenerJubatus
2018-09-17 16:31:13 -06:00
parent b984b7fd30
commit 6cc329a7ea
5 changed files with 22 additions and 22 deletions
@@ -341,7 +341,7 @@ if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -379,7 +379,7 @@ if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then
CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -117,7 +117,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime);
OnCommand=cmd(playcommand,"Set");
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -135,7 +135,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime);
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -159,7 +159,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime);
OnCommand=cmd(playcommand,"Set");
CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -177,7 +177,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime);
CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set");
ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -185,7 +185,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -210,7 +210,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -235,7 +235,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -260,7 +260,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -207,7 +207,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -232,7 +232,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -257,7 +257,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -282,7 +282,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -317,7 +317,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -342,7 +342,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -367,7 +367,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -392,7 +392,7 @@ t[#t+1] = Def.ActorFrame {
PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75);
ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then
@@ -85,7 +85,7 @@ t[#t+1] = Def.ActorFrame {
LoadFont("Common Italic Condensed") .. {
OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF"));
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1:GetAuthorCredit() ~= "" then
@@ -102,7 +102,7 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(addy,22);
OnCommand=cmd(playcommand,"Set";horizalign,left;zoom,0.75;diffuse,color("#FFFFFF"));
SetCommand=function(self)
stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP1 ~= nil then
@@ -125,7 +125,7 @@ t[#t+1] = Def.ActorFrame {
LoadFont("Common Italic Condensed") .. {
OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF"));
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
local diff = stepsP2:GetDifficulty();
@@ -144,7 +144,7 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(addy,22);
OnCommand=cmd(playcommand,"Set";horizalign,right;zoom,0.75;diffuse,color("#FFFFFF"));
SetCommand=function(self)
stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
local song = GAMESTATE:GetCurrentSong();
if song then
if stepsP2 ~= nil then