From cf74b5cae1d5c9c329fc9abbbb0d912ab7b0d26b Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Sun, 28 Jul 2024 14:23:54 +0300
Subject: [PATCH] map reading improvements

---
 map.cpp | 3 +--
 map.h   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/map.cpp b/map.cpp
index 04a2b1d..bc8f6e4 100755
--- a/map.cpp
+++ b/map.cpp
@@ -142,8 +142,7 @@ namespace battleship{
 	void Map::loadSpawnPoints(){
 		sol::state_view SOL_LUA_VIEW = generateView();
 		string spawnPointInd = "spawnPoints";
-		SOL_LUA_VIEW.script("numSpawnPoints = #" + mapTable + "." + spawnPointInd);
-		int numSpawnPoints = SOL_LUA_VIEW["numSpawnPoints"];
+		int numSpawnPoints = ((sol::table)SOL_LUA_VIEW[mapTable][spawnPointInd]).size();
 
 		for(int i = 0; i < numSpawnPoints; i++){
 			sol::table posTable = SOL_LUA_VIEW[mapTable][spawnPointInd][i + 1];
diff --git a/map.h b/map.h
index 0d5d4fb..2810b3d 100755
--- a/map.h
+++ b/map.h
@@ -54,6 +54,7 @@ namespace battleship{
 		inline vb01::Vector3 getCellSize(){return CELL_SIZE;}
 		inline int getNumSpawnPoints(){return spawnPoints.size();}
 		inline vb01::Vector3 getSpawnPoint(int i){return spawnPoints[i];}
+		inline vb01::Vector3 getMapSize(){return mapSize;}
 		inline void addSpawnPoint(vb01::Vector3 sp){spawnPoints.push_back(sp);}
 		inline std::vector<Map::Cell>& getCells(){return cells;}
     private: