Variable name change to lyrics.

Author: MikuAuahDark

game/live/lyrics.lua

@@ -8,10 +8,11 @@ local Luaoop = require("libs.Luaoop")
 local color = require("color")
 local MainFont = require("main_font")
 
-local lyrics = Luaoop.class("Livesim2.Lyrics")
+---@class Livesim2.Lyrics
+local Lyrics = Luaoop.class("Livesim2.Lyrics")
 local perZeroThree = 1/0.3
 
-function lyrics:__construct(srt)
+function Lyrics:__construct(srt)
 	local font1, font2 = MainFont.get(24, 16)
 	local timings = {}
 
@@ -41,7 +42,8 @@ function lyrics:__construct(srt)
 	end
 end
 
-function lyrics:update(dt)
+---@param dt number
+function Lyrics:update(dt)
 	self.elapsedTime = self.elapsedTime + dt
 
 	local lyr = self.timings[1]
@@ -67,7 +69,7 @@ function lyrics:update(dt)
 	end
 end
 
-function lyrics:draw()
+function Lyrics:draw()
 	if self.active then
 		love.graphics.setColor(color.compat(255, 255, 255, self.opacity * perZeroThree))
 		love.graphics.draw(self.active[3], 6, 590)
@@ -77,4 +79,5 @@ function lyrics:draw()
 	end
 end
 
-return lyrics
+---@cast Lyrics +fun(srt):Livesim2.Lyrics
+return Lyrics

io_open_wide.lua

@@ -61,14 +61,19 @@ end
 
 local open = io.open
 
-function io.open(path, mode)
-	local pathw = toWideChar(path)
+---@param filename string
+---@param mode?    openmode
+---@return file*?
+---@return string? errmsg
+---@nodiscard
+function io.open(filename, mode)
+	local pathw = toWideChar(filename)
 	local modew = toWideChar(mode)
 
 	local file = assert(open("nul", "rb"))
 	if ffi.C._wfreopen(pathw, modew, file) == nil then
 		local msg, errno = select(2, file:close())
-		return nil, path..": "..msg, errno
+		return nil, filename..": "..msg, errno
 	end
 
 	return file

util.lua

@@ -16,23 +16,24 @@ end
 local Util = {}
 
 ---@param maj number
----@param min number
----@param rev number
----@return "-1" | "0" | "1"
+---@param min number?
+---@param rev number?
+---@return -1 | 0 | 1
 function Util.compareLOVEVersion(maj, min, rev)
-	if love._version_major > maj then
+	local major, minor, revision = love.getVersion()
+	if major > maj then
 		return 1
-	elseif love._version_major < maj then
+	elseif major < maj then
 		return -1
 	elseif min then
-		if love._version_minor > min then
+		if minor > min then
 			return 1
-		elseif love._version_minor < min then
+		elseif minor < min then
 			return -1
 		elseif rev then
-			if love._version_revision > rev then
+			if revision > rev then
 				return 1
-			elseif love._version_revision < rev then
+			elseif revision < rev then
 				return -1
 			end
 		end
@@ -42,6 +43,7 @@ function Util.compareLOVEVersion(maj, min, rev)
 end
 
 local version11 = Util.compareLOVEVersion(11, 0) >= 0
+local version12 = Util.compareLOVEVersion(12, 0) >= 0
 
 ---@param file string
 function Util.basename(file)
@@ -290,7 +292,7 @@ end
 
 function Util.newVideoStream(path)
 	if hasLVEP then
-		local s, v = pcall(love.video.newStream, path)
+		local s, v = pcall(lvep.newStream, path)
 		if not(s) then
 			return lvep.newVideoStream(path)
 		else
@@ -316,7 +318,7 @@ function Util.decompressToData(data, algo)
 	end
 end
 
-if Util.compareLOVEVersion(12, 0) >= 0 then
+if version12 then
 	function Util.stencil11(fn, action, value, keepvalue)
 		love.graphics.setColorMask(false)
 		love.graphics.setStencilMode(action, "always", value)