Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
-17
View File
@@ -16,16 +16,6 @@
#pragma once
struct SMinimapInfo
{
Vec2 vCenter;
Vec2 vExtends;
// float RenderBoxSize;
int textureWidth;
int textureHeight;
int orientation;
};
/*!
CMission represent single Game Mission on same map.
Multiple Missions share same map, and stored in one .cry or .ly file.
@@ -82,11 +72,6 @@ public:
void OnEnvironmentChange();
int GetNumCGFObjects() const { return m_numCGFObjects; };
//////////////////////////////////////////////////////////////////////////
// Minimap.
void SetMinimap(const SMinimapInfo& info);
const SMinimapInfo& GetMinimap() const;
private:
//! Document owner of this mission.
CCryEditDoc* m_doc;
@@ -115,8 +100,6 @@ private:
int m_numCGFObjects;
SMinimapInfo m_minimap;
bool m_reentrancyProtector;
};