From 01c04f3963bc7d10e1d4d63d5586f3d5e04fdb2c Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 29 Jun 2019 18:05:23 +0300 Subject: Fixed merge --- src/World.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/World.h b/src/World.h index fb9b3b7e..90e732a5 100644 --- a/src/World.h +++ b/src/World.h @@ -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]; } -- cgit v1.2.3