Merge branch 'master' of https://github.com/FajsiEx/exceed

scripts/titlescreen.lua

@@ -3,7 +3,7 @@ require('common')
 local Footer = require('components.footer');
 local Background = require('components.background');
 
-local lol = require("language.call")
+local lang = require("language.call")
 
 local cursorIndex = 3;
 local buttonHeight = 128 + 16;
@@ -50,10 +50,10 @@ game.LoadSkinSample('titlescreen/bgm.wav');
 game.LoadSkinSample('titlescreen/cursor_change.wav');
 game.LoadSkinSample('titlescreen/cursor_select.wav');
 
-local selectorDescriptionLabel = gfx.CreateLabel(lol.Start.desc , 22, 0);
+local selectorDescriptionLabel = gfx.CreateLabel(lang.Start.desc , 22, 0);
 
-local selectorLegendScrollLabel = gfx.CreateLabel(lol.Start.sc , 20, 0);
-local selectorLegendSelectLabel = gfx.CreateLabel(lol.Start.st3 , 20, 0);
+local selectorLegendScrollLabel = gfx.CreateLabel(lang.Start.sc , 20, 0);
+local selectorLegendSelectLabel = gfx.CreateLabel(lang.Start.st3 , 20, 0);
 
 local scrollTransitionScale = 1; -- Goes from 0 to 1 when transition is happening, sits at 1 when it's not.
 local buttonsMovementScale = 0; -- Basically same as `scrollTransitionScale` but with a +/- sign for the scroll direction and goes from 1 to 0
@@ -204,7 +204,7 @@ function drawTexts()
     gfx.UpdateLabel(selectorDescriptionLabel, currentFullDescriptionText, 22)
 
     gfx.BeginPath();
-    gfx.UpdateLabel(selectorLegendScrollLabel, 'SCROLL', 20);
+--    gfx.UpdateLabel(selectorLegendScrollLabel, 'SCROLL', 20);
 
     -- descriptionAlpha = math.abs(selectedButtonScaleY - 0.5) * 2;
     gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE);
@@ -234,27 +234,27 @@ function setButtons()
         buttons = {}
         buttons[1] = {
             skillLabelImage, 412, Menu.Challenges,
-            lol.Challanges.ch,  lol.Challanges.ch1
+            lang.Challanges.ch,  lang.Challanges.ch1
         }
         buttons[2] = {
             friendLabelImage, 169, Menu.Multiplayer,
-            lol.Multiplayer.mp, lol.Multiplayer.mp2
+            lang.Multiplayer.mp, lang.Multiplayer.mp2
         }
         buttons[3] = {
             normalLabelImage, 210, Menu.Start,
-            lol.Start.st, lol.Start.st2
+            lang.Start.st, lang.Start.st2
         }
         buttons[4] = {
             nauticaLabelImage, 230, Menu.DLScreen,
-            lol.Nautica.dls, lol.Nautica.dls2
+            lang.Nautica.dls, lang.Nautica.dls2
         }
         buttons[5] = {
             settingsLabelImage, 247, Menu.Settings,
-            lol.Settings.se, lol.Settings.se1
+            lang.Settings.se, lang.Settings.se1
         }
         buttons[6] = {
             exitLabelImage, 110, Menu.Exit,
-            lol.Exit.ex, lol.Exit.ex2
+            lang.Exit.ex, lang.Exit.ex2
         }
     end
 end