weapons, viewmodels, some performance fixes

1 files changed, 6 insertions, 4 deletions

diff --git a/src/player_controller/playercontroller.h b/src/player_controller/playercontroller.h
index 402f7d3..c1aee94 100644
--- a/src/player_controller/playercontroller.h
+++ b/src/player_controller/playercontroller.h
@@ -17,12 +17,12 @@ namespace godot {
 class PlayerController : public RigidBody {
     GODOT_CLASS(PlayerController, RigidBody)
 
-private:
+public:
 	String team;
 	int health;
 	Node *weapon;
 	Spatial *world;
-    PlayerCam *cam;
+    Camera *cam;
 	float mouse_sensitivity;
 	float FOV;
 	Vector2 mouse_axis;
@@ -55,7 +55,7 @@ private:
 	float air_control;
 
 
-public:
+//public:
     static void _register_methods();
 
     PlayerController();
@@ -69,7 +69,7 @@ public:
 	void set_phys_transform(Transform trfrm, Vector3 lvel);
 	void _process(float _delta);
 	void initiate_use();
-	void set_net_owner(int owner_id);
+	void set_net_owner(Variant owner_id);
 	void deselect_character();
 	void take_control_of_machine(RigidBody *slave_machine);
 	void lose_machine();
@@ -87,6 +87,8 @@ public:
 	void damage(int dmg_amt, String _type, Array shooter, String extra);
 	void remove_dead_character();
 	void net_apply_impulse(Vector3 impulse_v);
+    Spatial* get_neck();
+    Spatial* get_head();
 };
 
 }