Fixed merge
This commit is contained in:
parent
1d620f4b67
commit
01c04f3963
@ -69,7 +69,6 @@ public:
|
||||
|
||||
static void Remove(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 CPtrList &GetBigBuildingList(eLevelName i) { return ms_bigBuildingsList[i]; }
|
||||
|
Loading…
Reference in New Issue
Block a user