sync with upstream

2020-05-17 21:48:21 +03:00
parent 3cc20d7962
commit d5d2f6a822
3 changed files with 0 additions and 13 deletions
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -94,8 +94,6 @@ public:
 	static void Load(uint8 *buf, uint32 size);
 	static void Save(uint8 *buf, uint32 *size);

-	static bool TestForPickupsInBubble(CVector pos, float radius);
-
 	static CPickup aPickUps[NUMPICKUPS];

 	// unused