EShoot: changed to string weaponType to int currentlyEquippedItem

PlayerSystem.h: added HeldItem enum PlayerSystem.cpp: simplified writing doubles, uses HeldItem enum ShootEventTest.cpp: simplified writing doubles
2016-01-11 15:43:12 +01:00
parent 2cd0e94a60
commit 2f6261dfbf
4 changed files with 32 additions and 27 deletions
@@ -12,7 +12,7 @@ struct Shoot : Event
 {
    //shotgun etc has different amounts of damage probably (a sniper shot might one-shot)
    //also different weapons will have different spread
-    std::string weaponType;
+    int currentlyEquippedItem;
    //currentAimingPoint must be sent, in case the camera is moved while the event is being processed
    glm::vec2 currentAimingPoint;
 };