Skip to content

Commit 90469ea

Browse files
committed
Show LOVE version & codename in system info.
1 parent 6de6819 commit 90469ea

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

conf.lua

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ love.filesystem.load("errorhandler.lua")()
2121
-- Set in main.lua later
2222
DEPLS_VERSION = false
2323
DEPLS_VERSION_NUMBER = false
24+
DEPLS_VERSION_CODENAME = false
2425

2526
if love._exe then
2627
setmetatable(_G, {

game/states/main_menu.lua

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- Main Menu
22
-- Part of Live Simulator: 2
33
-- See copyright notice in main.lua
4-
-- luacheck: read_globals DEPLS_VERSION DEPLS_VERSION_NUMBER
4+
-- luacheck: read_globals DEPLS_VERSION DEPLS_VERSION_NUMBER DEPLS_VERSION_CODENAME
55

66
local love = require("love")
77
local Luaoop = require("libs.Luaoop")
@@ -81,7 +81,9 @@ local function initializeVersionText()
8181

8282
bld[#bld + 1] = "Live Simulator: 2 v"
8383
bld[#bld + 1] = DEPLS_VERSION
84-
bld[#bld + 1] = " ("
84+
bld[#bld + 1] = " \""
85+
bld[#bld + 1] = DEPLS_VERSION_CODENAME
86+
bld[#bld + 1] = "\" ("
8587
bld[#bld + 1] = string.format("%08d", DEPLS_VERSION_NUMBER)
8688
bld[#bld + 1] = ") ("
8789
bld[#bld + 1] = jit and jit.version or _VERSION

game/states/systeminfo.lua

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
-- Part of Live Simulator: 2
33
-- See copyright notice in main.lua
44

5-
-- luacheck: read_globals DEPLS_VERSION
6-
-- luacheck: read_globals DEPLS_VERSION_NUMBER
5+
-- luacheck: read_globals DEPLS_VERSION DEPLS_VERSION_NUMBER DEPLS_VERSION_CODENAME
76

87
local love = require("love")
98
local color = require("color")
@@ -102,6 +101,7 @@ do
102101
end
103102
elseif ver.dwMajorVersion == 5 then
104103
if ver.dwMinorVersion == 2 then
104+
-- Probably not
105105
osVersionString = string.format("OS: Windows XP Professional 64-bit (%s)", build)
106106
elseif ver.dwMinorVersion == 1 then
107107
osVersionString = string.format("OS: Windows XP (%s)", build)
@@ -134,7 +134,8 @@ local function buildTextString()
134134
local sb = {
135135
"Before reporting bug, please screenshot this window",
136136
"",
137-
string.format("Live Simulator: 2 v%s -- %08d", DEPLS_VERSION, DEPLS_VERSION_NUMBER),
137+
string.format("Live Simulator: 2 v%s \"%s\" %08d", DEPLS_VERSION, DEPLS_VERSION_CODENAME, DEPLS_VERSION_NUMBER),
138+
string.format("LOVE %d.%d.%d \"%s\"", love.getVersion())
138139
}
139140

140141
do
@@ -237,9 +238,9 @@ function sysInfo:load()
237238
for i = 0, 360, 45 do
238239
local mag = i % 90 == 0 and 1 or math.sqrt(2)
239240
local x, y = mag * math.cos(math.rad(i)), mag * math.sin(math.rad(i))
240-
self.data.text:addf({color.black, textString}, 950, "left", 2 + x, 60 + y)
241+
self.data.text:addf({color.black, textString}, 956, "left", 2 + x, 50 + y)
241242
end
242-
self.data.text:addf({color.white, textString}, 950, "left", 2, 60)
243+
self.data.text:addf({color.white, textString}, 956, "left", 2, 50)
243244
end
244245
glow.addFixedElement(self.data.back, 0, 0)
245246
end

main.lua

+14-10
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@
2222

2323
-- luacheck: globals DEPLS_VERSION
2424
-- luacheck: globals DEPLS_VERSION_NUMBER
25+
-- luacheck: globals DEPLS_VERSION_CODENAME
2526

2627
-- Version string
27-
DEPLS_VERSION = "3.0.5"
28+
DEPLS_VERSION = "3.0.6"
2829
-- Version number
2930
-- In form xxyyzzww. x = major, y = minor, z = patch, w = pre-release counter (99 = not a pre release)
30-
DEPLS_VERSION_NUMBER = 03000599
31+
DEPLS_VERSION_NUMBER = 03000699
32+
-- Version codename
33+
DEPLS_VERSION_CODENAME = "Time Lapse"
3134

3235
local love = require("love")
3336
local Yohane = require("libs.Yohane")
@@ -302,15 +305,11 @@ Options:
302305
303306
* -dump Dump beatmap data to stdout instead of playing
304307
the game. It will output SIF-compatible JSON
305-
beatmap format.
308+
beatmap format by default.
306309
307310
* -dumpformat <format> Set the format of the beatmap dump for -dump
308311
option.
309312
* -dumpformat json Dump beatmap as JSON beatmap. This is default.
310-
* -dumpformat llp Dump beatmap as LLP beatmap.
311-
* -dumpformat ls2 Dump beatmap as Live Simulator: 2 v2.0 binary
312-
beatmap. If this is used, -dumpout must be
313-
specified for Windows (unimplemented).
314313
315314
* -fullscreen Start Live Simulator: 2 fullscreen.
316315
@@ -342,8 +341,8 @@ Options:
342341
container and audio is in WAV format. FFmpeg
343342
libraries must be installed to use this feature!
344343
345-
* -renderfxaa Use Fast Approximate Anti-Aliasing for the whole
346-
rendering.
344+
* -renderfxaa Apply Fast Approximate Anti-Aliasing to the whole
345+
screen while rendering to video file.
347346
348347
* -renderheight <height> Set video rendering height. Defaults to window
349348
height if not specified.
@@ -505,7 +504,12 @@ function love.load(argv, gameargv)
505504
i = i + 1
506505
elseif arg == "-version" then
507506
local capabilities = require("capabilities")
508-
print(string.format("Live Simulator: 2 v%s (%08d)", DEPLS_VERSION, DEPLS_VERSION_NUMBER))
507+
print(string.format(
508+
"Live Simulator: 2 v%s \"%s\" (%08d)",
509+
DEPLS_VERSION,
510+
DEPLS_VERSION_CODENAME,
511+
DEPLS_VERSION_NUMBER
512+
))
509513
print("Capabilities: "..capabilities())
510514
love.event.quit()
511515
return

0 commit comments

Comments
 (0)