sync with master

2020-04-15 23:31:52 +03:00
parent 1d8484ed7d 5cb7e2e42a
commit 1795f3d479
41 changed files with 2746 additions and 246 deletions
--- a/src/weapons/BulletInfo.h
+++ b/src/weapons/BulletInfo.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Weapon.h"

 class CEntity;
+enum eWeaponType;

 class CBulletInfo
 {