Fix merge conflicts, additional legal cleanup

AUTHORS.md

@@ -6,7 +6,7 @@ This is the credit list of **all** the people who contributed to TombEngine in a
 
 - MontyTRC (Project Leader)
 
-- Gancian (general coding
+- Gancian (general coding)
 - Krystian (general coding)
 - Kubsy (Some cleanups and fixes)
 - l.m. (general coding, Lua enhancements, bug fixing)
@@ -17,7 +17,7 @@ This is the credit list of **all** the people who contributed to TombEngine in a
 - Sezz (player state refactoring, general coding, code cleanups, bug fixing, assets)
 - Squidshire (Hispidence) (Lua implementation, bug fixing)
 - Stranger1992 (sound asset refactoring and organisation, assets)
-- TrainWreck (asset coding and Lua enhancements
+- TrainWreck (asset coding and Lua enhancements)
 - TokyoSU (entity and vehicle decompilation)
 - Tomo (general coding, special FX coding, bug fixing)
 - Troye (general coding, refactoring)

TombEngine/Objects/game_object_ids.h

@@ -746,7 +746,7 @@ enum GAME_OBJECT_ID : short
 	ID_INVENTORY_SUNGLASSES,
 	ID_INVENTORY_KEYS,
 	ID_INVENTORY_HEADPHONES,
-	ID_INVENTORY_POLAROID,
+	ID_INVENTORY_PHOTO,
 
 	ID_SMOKE_EMITTER_WHITE = 1020,
 	ID_SMOKE_EMITTER_BLACK,

TombEngine/Scripting/Internal/TEN/Objects/ObjectIDs.h

@@ -1,7 +1,7 @@
 #pragma once
 
 // This file is generated automatically, do not edit it.
-// Last generated on 17/03/2025.
+// Last generated on 18/04/2025.
 
 #include <unordered_map>
 #include <string>
@@ -746,7 +746,7 @@ The following constants are inside ObjID.
 	INVENTORY_SUNGLASSES
 	INVENTORY_KEYS
 	INVENTORY_HEADPHONES
-	INVENTORY_POLAROID
+	INVENTORY_PHOTO
 	SMOKE_EMITTER_WHITE
 	SMOKE_EMITTER_BLACK
 	SMOKE_EMITTER
@@ -1986,7 +1986,7 @@ static const std::unordered_map<std::string, GAME_OBJECT_ID> GAME_OBJECT_IDS {
 	{ "INVENTORY_SUNGLASSES", ID_INVENTORY_SUNGLASSES },
 	{ "INVENTORY_KEYS", ID_INVENTORY_KEYS },
 	{ "INVENTORY_HEADPHONES", ID_INVENTORY_HEADPHONES },
-	{ "INVENTORY_POLAROID", ID_INVENTORY_POLAROID },
+	{ "INVENTORY_PHOTO", ID_INVENTORY_PHOTO },
 	{ "SMOKE_EMITTER_WHITE", ID_SMOKE_EMITTER_WHITE },
 	{ "SMOKE_EMITTER_BLACK", ID_SMOKE_EMITTER_BLACK },
 	{ "SMOKE_EMITTER", ID_SMOKE_EMITTER },

TombEngine/version.h

@@ -5,7 +5,7 @@
 #define TEN_BUILD_NUMBER    2
 #define TEN_REVISION_NUMBER 0
 
-#define TEST_BUILD 0
+#define TEST_BUILD 1
 
 #define TOSTR(x) #x
 #define MAKE_VERSION_STRING(major, minor, build, revision) TOSTR(major) "." TOSTR(minor) "." TOSTR(build) "." TOSTR(revision)