Merge pull request #45 from nlinker/master

Use `cast_to_bw` and `cast_from_bw` for some type conversions

src/AIModule.cpp

@@ -1,7 +1,5 @@
 #include <AIModule.h>
-#include <BWAPI/AIModule.h>
-
-#include "Position.hpp"
+#include "Cast.hpp"
 
 class AIModuleWrapper : public BWAPI::AIModule
 {
@@ -28,7 +26,7 @@ class AIModuleWrapper : public BWAPI::AIModule
         module->vtable->onPlayerLeft(module, reinterpret_cast<Player*>(player));
     }
     virtual void onNukeDetect(BWAPI::Position target) override {
-        module->vtable->onNukeDetect(module, position_from_bw(target));
+        module->vtable->onNukeDetect(module, cast_from_bw(target));
     }
     virtual void onUnitDiscover(BWAPI::Unit unit) override {
         module->vtable->onUnitDiscover(module, reinterpret_cast<Unit*>(unit));

src/Bullet.cpp

@@ -1,8 +1,4 @@
-#include <Bullet.h>
-#include <BWAPI/Bullet.h>
-
-#include "BulletType.hpp"
-#include "Position.hpp"
+#include "Cast.hpp"
 
 int Bullet_getID(Bullet* self) {
     return reinterpret_cast<BWAPI::Bullet>(self)->getID();
@@ -17,15 +13,15 @@ Player* Bullet_getPlayer(Bullet* self) {
 }
 
 BulletType Bullet_getType(Bullet* self) {
-    return bullettype_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getType() );
+    return cast_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getType() );
 }
 
 Unit* Bullet_getSource(Bullet* self) {
     return reinterpret_cast<Unit*>( reinterpret_cast<BWAPI::Bullet>(self)->getSource() );
 }
 
 Position Bullet_getPosition(Bullet* self) {
-    return position_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getPosition() );
+    return cast_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getPosition() );
 }
 
 double Bullet_getAngle(Bullet* self) {
@@ -45,7 +41,7 @@ Unit* Bullet_getTarget(Bullet* self) {
 }
 
 Position Bullet_getTargetPosition(Bullet* self) {
-    return position_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getTargetPosition() );
+    return cast_from_bw( reinterpret_cast<BWAPI::Bullet>(self)->getTargetPosition() );
 }
 
 int Bullet_getRemoveTimer(Bullet* self) {