From e3ecc3acdba35593d0c0d55eef21b11e183aa4c3 Mon Sep 17 00:00:00 2001
From: Lwmte <3331699+Lwmte@users.noreply.github.com>
Date: Tue, 24 Dec 2024 23:22:02 +0100
Subject: [PATCH] Update docs, fix savegame formatting, bump version
---
Documentation/config.ld | 2 +-
Documentation/doc/1 modules/Effects.html | 2 +-
Documentation/doc/1 modules/Flow.html | 2 +-
Documentation/doc/1 modules/Input.html | 2 +-
Documentation/doc/1 modules/Inventory.html | 2 +-
Documentation/doc/1 modules/Logic.html | 2 +-
Documentation/doc/1 modules/Objects.html | 2 +-
Documentation/doc/1 modules/Sound.html | 2 +-
Documentation/doc/1 modules/Strings.html | 2 +-
Documentation/doc/1 modules/Util.html | 2 +-
Documentation/doc/1 modules/View.html | 2 +-
Documentation/doc/2 classes/Flow.Level.html | 2 +-
Documentation/doc/2 classes/Flow.Settings.html | 2 +-
Documentation/doc/2 classes/Flow.Statistics.html | 2 +-
Documentation/doc/2 classes/Objects.AIObject.html | 2 +-
Documentation/doc/2 classes/Objects.Camera.html | 2 +-
Documentation/doc/2 classes/Objects.LaraObject.html | 2 +-
Documentation/doc/2 classes/Objects.Moveable.html | 2 +-
Documentation/doc/2 classes/Objects.Room.html | 2 +-
Documentation/doc/2 classes/Objects.Sink.html | 2 +-
Documentation/doc/2 classes/Objects.SoundSource.html | 2 +-
Documentation/doc/2 classes/Objects.Static.html | 2 +-
Documentation/doc/2 classes/Objects.Volume.html | 2 +-
Documentation/doc/2 classes/Strings.DisplayString.html | 2 +-
Documentation/doc/2 classes/View.DisplaySprite.html | 2 +-
Documentation/doc/3 primitive classes/Color.html | 2 +-
Documentation/doc/3 primitive classes/Flow.Fog.html | 2 +-
.../doc/3 primitive classes/Flow.InventoryItem.html | 2 +-
Documentation/doc/3 primitive classes/Flow.LensFlare.html | 2 +-
Documentation/doc/3 primitive classes/Flow.SkyLayer.html | 2 +-
Documentation/doc/3 primitive classes/Flow.Starfield.html | 2 +-
Documentation/doc/3 primitive classes/Rotation.html | 2 +-
Documentation/doc/3 primitive classes/Time.html | 2 +-
Documentation/doc/3 primitive classes/Vec2.html | 2 +-
Documentation/doc/3 primitive classes/Vec3.html | 2 +-
Documentation/doc/4 enums/Effects.BlendID.html | 2 +-
Documentation/doc/4 enums/Effects.EffectID.html | 2 +-
Documentation/doc/4 enums/Flow.ErrorMode.html | 2 +-
Documentation/doc/4 enums/Flow.FreezeMode.html | 2 +-
Documentation/doc/4 enums/Flow.GameStatus.html | 2 +-
Documentation/doc/4 enums/Input.ActionID.html | 2 +-
Documentation/doc/4 enums/Objects.AmmoType.html | 2 +-
Documentation/doc/4 enums/Objects.MoveableStatus.html | 2 +-
Documentation/doc/4 enums/Objects.ObjID.html | 2 +-
Documentation/doc/4 enums/Objects.RoomFlagID.html | 2 +-
Documentation/doc/4 enums/Objects.RoomReverb.html | 2 +-
Documentation/doc/4 enums/Objects.WeaponType.html | 2 +-
Documentation/doc/4 enums/Sound.SoundTrackType.html | 2 +-
Documentation/doc/4 enums/Strings.DisplayStringOption.html | 2 +-
Documentation/doc/4 enums/Util.LogLevel.html | 2 +-
Documentation/doc/4 enums/View.AlignMode.html | 2 +-
Documentation/doc/4 enums/View.CameraType.html | 2 +-
Documentation/doc/4 enums/View.PostProcessMode.html | 2 +-
Documentation/doc/4 enums/View.ScaleMode.html | 2 +-
Documentation/doc/5 lua utility modules/EventSequence.html | 2 +-
Documentation/doc/5 lua utility modules/Timer.html | 2 +-
Documentation/doc/5 lua utility modules/Type.html | 2 +-
Documentation/doc/index.html | 4 ++--
TombEngine/Renderer/RendererDrawMenu.cpp | 5 +++--
TombEngine/version.h | 6 +++---
60 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/Documentation/config.ld b/Documentation/config.ld
index 827cf2d1e..6053ee303 100644
--- a/Documentation/config.ld
+++ b/Documentation/config.ld
@@ -12,7 +12,7 @@ new_type("luautil", "5 Lua utility modules", true)
not_luadoc = true
-local version = "1.6"
+local version = "1.7"
project = " TombEngine"
title = "TombEngine " .. version .. " Lua API"
description = "TombEngine " .. version .. " scripting interface"
diff --git a/Documentation/doc/1 modules/Effects.html b/Documentation/doc/1 modules/Effects.html
index 3ef210539..25c5e3562 100644
--- a/Documentation/doc/1 modules/Effects.html
+++ b/Documentation/doc/1 modules/Effects.html
@@ -3,7 +3,7 @@
-
-
TombEngine 1.6 scripting interface
+
TombEngine 1.7 scripting interface
Welcome to the TombEngine scripting API. This is a work in progress and some information might be wrong or outdated. Please also note that this is primarily a reference document, not a tutorial, so expect descriptions to be fairly sparse.
At the time of writing, there is a tutorial describing the basics of Lua, as well as a number of example scripts, on the TombEngine website.
diff --git a/TombEngine/Renderer/RendererDrawMenu.cpp b/TombEngine/Renderer/RendererDrawMenu.cpp
index 6d9dd8641..a7d9cb809 100644
--- a/TombEngine/Renderer/RendererDrawMenu.cpp
+++ b/TombEngine/Renderer/RendererDrawMenu.cpp
@@ -34,6 +34,7 @@ namespace TEN::Renderer
constexpr auto MenuLoadNumberLeftSide = 80;
constexpr auto MenuLoadNameLeftSide = 150;
+ constexpr auto MenuLoadTimestampRightSide = 600;
// Vertical spacing templates
constexpr auto MenuVerticalLineSpacing = 30;
@@ -657,7 +658,7 @@ namespace TEN::Renderer
// Timestamp
sprintf(stringBuffer, g_GameFlow->GetString(STRING_SAVEGAME_TIMESTAMP), save.Hours, save.Minutes, save.Seconds);
- AddString(MenuRightSideEntry, y, stringBuffer, PRINTSTRING_COLOR_WHITE, SF(selection == n));
+ AddString(MenuLoadTimestampRightSide, y, stringBuffer, PRINTSTRING_COLOR_WHITE, SF(selection == n));
}
GetNextLinePosition(&y);
@@ -1227,7 +1228,7 @@ namespace TEN::Renderer
void Renderer::DrawDebugInfo(RenderView& view)
{
-#ifdef TEST_BUILD
+#if TEST_BUILD
if (CurrentLevel == 0)
{
AddString("TombEngine " + std::string(TEN_VERSION_STRING) + " test build - not for distribution",
diff --git a/TombEngine/version.h b/TombEngine/version.h
index 1f244287b..040d8d685 100644
--- a/TombEngine/version.h
+++ b/TombEngine/version.h
@@ -6,11 +6,11 @@
#define TE_REVISION_NUMBER 0
#define TEN_MAJOR_VERSION 1
-#define TEN_MINOR_VERSION 6
+#define TEN_MINOR_VERSION 7
#define TEN_BUILD_NUMBER 0
-#define TEN_REVISION_NUMBER 6
+#define TEN_REVISION_NUMBER 0
-#define TEST_BUILD 1
+#define TEST_BUILD 0
#define TOSTR(x) #x
#define MAKE_VERSION_STRING(major, minor, build, revision) TOSTR(major) "." TOSTR(minor) "." TOSTR(build) "." TOSTR(revision)