From 8a885391f90aa71d7b7c653fcb92c3c5c0d09b47 Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Sat, 9 Mar 2024 14:54:20 +0200
Subject: [PATCH] guiScreen is now an optional property

---
 Assets/Scripts/GameObjects/Units/unitData.lua | 18 ------------------
 unit.cpp                                      |  5 ++++-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Assets/Scripts/GameObjects/Units/unitData.lua b/Assets/Scripts/GameObjects/Units/unitData.lua
index 5e42330..972c0e0 100644
--- a/Assets/Scripts/GameObjects/Units/unitData.lua
+++ b/Assets/Scripts/GameObjects/Units/unitData.lua
@@ -73,7 +73,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 1
 	},
 	{
@@ -97,7 +96,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 2
 	},
 	{
@@ -121,7 +119,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 2
 	},
 	{
@@ -181,7 +178,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -206,7 +202,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -233,7 +228,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -257,7 +251,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -282,7 +275,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -306,7 +298,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -330,7 +321,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -353,7 +343,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -385,7 +374,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -424,7 +412,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -456,7 +443,6 @@ units = {
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
-		guiScreen = '',
 		garrisonCategory = 3
 	},
 	{
@@ -513,7 +499,6 @@ units = {
 		basePath = PATH .. structurePrefix .. 'Markets/',
 		meshPath = 'market.xml',
 		selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
-		guiScreen = '',
 		deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
 	},
 	{
@@ -551,7 +536,6 @@ units = {
 		basePath = PATH .. structurePrefix .. 'PointDefenses/',
 		meshPath = 'pointDefense.xml',
 		selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
-		guiScreen = '',
 		deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
 	},
 	{
@@ -570,7 +554,6 @@ units = {
 		basePath = PATH .. structurePrefix .. 'Extractors/',
 		meshPath = 'extractor.xml',
 		selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
-		guiScreen = '',
 		deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
 	},
 	{
@@ -586,7 +569,6 @@ units = {
 		name = 'Refinery',
 		basePath = PATH .. structurePrefix .. 'Refineries/',
 		meshPath = 'refinery.xml',
-		guiScreen = '',
 		selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
 		deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
 	},
diff --git a/unit.cpp b/unit.cpp
index d800920..c250ef0 100755
--- a/unit.cpp
+++ b/unit.cpp
@@ -141,7 +141,10 @@ namespace battleship{
         lineOfSight = unitTable["lineOfSight"]; lineOfSight += game->calcAbilFromTech(Ability::Type::LINE_OF_SIGHT, currTechs, (int)GameObject::type, id);
         unitClass = (UnitClass)unitTable["unitClass"];
 		type = (UnitType)unitTable["unitType"];
-		guiScreen = unitTable["guiScreen"];
+
+		string gsk = "guiScreen";
+		sol::optional<string> nameOpt = unitTable[gsk];
+		guiScreen = (nameOpt != sol::nullopt ? (string)unitTable[gsk] : "");
 
 		string tblName = "garrisonCapacity";
 		sol::optional<sol::table> gc = unitTable[tblName];