Browse Source

Merge branch 'main' of https://github.com/NiroUwU/Questionable-Oerbital-Mechanics into testing

tags/v0.0.6_dev
Madiwka 2 years ago
parent
commit
cec04960f7
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      main.lua
  2. +1
    -1
      src/class/Textbox.lua

+ 1
- 1
main.lua View File

@@ -34,7 +34,7 @@ function love.load()


-- Textboxes: -- Textboxes:
textbox = { textbox = {
tutorial = Textbox(40, 40, width-80, height-80, text.tutorial, "center", {255, 255, 255}, {0, 0, 0})
tutorial = Textbox(40, 40, width-80, height-80, getText(text.tutorial), "center", {255, 255, 255}, {0, 0, 0})
} }






+ 1
- 1
src/class/Textbox.lua View File

@@ -8,7 +8,7 @@ function Textbox:init(tempX, tempY, tempW, tempH, tempText, tempAlign, tempTC, t
self.h = tempH self.h = tempH


-- Text: -- Text:
self.text = calc.getText(tempText)
self.text = tempText
self.align = tempAlign self.align = tempAlign


-- Colours: -- Colours:


Loading…
Cancel
Save