mirror of
https://gitlab.com/skmp/dca3-game.git
synced 2025-08-19 13:02:02 +02:00
Fixed merge
This commit is contained in:
@@ -69,7 +69,6 @@ public:
|
|||||||
|
|
||||||
static void Remove(CEntity *entity);
|
static void Remove(CEntity *entity);
|
||||||
static void Add(CEntity *entity);
|
static void Add(CEntity *entity);
|
||||||
static void Remove(CEntity *ent);
|
|
||||||
|
|
||||||
static CSector *GetSector(int x, int y) { return &ms_aSectors[y][x]; }
|
static CSector *GetSector(int x, int y) { return &ms_aSectors[y][x]; }
|
||||||
static CPtrList &GetBigBuildingList(eLevelName i) { return ms_bigBuildingsList[i]; }
|
static CPtrList &GetBigBuildingList(eLevelName i) { return ms_bigBuildingsList[i]; }
|
||||||
|
Reference in New Issue
Block a user