X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWeapons.h;h=30fa1bb5d3754e99dbbc4f0409f8b0c0e991b4dc;hb=3c8f67c3c66a86fc9e45469ce2fed4222d486c9f;hp=36f18dee430c0d2427f4b4ea72f41838eb1a96f6;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/Weapons.h b/Source/Weapons.h
index 36f18de..30fa1bb 100644
--- a/Source/Weapons.h
+++ b/Source/Weapons.h
@@ -3,11 +3,11 @@
 
 /**> HEADER FILES <**/
 
-#include "gl.h"
+#include "gamegl.h"
 #include "Quaternions.h"
 #include "fmod.h"
-#include "skeleton.h"
-#include "models.h"
+#include "Skeleton.h"
+#include "Models.h"
 #include "Constants.h"
 #include "Terrain.h"
 #include "Sprites.h"
@@ -25,49 +25,53 @@ class Weapons
 {
 public:
 
-	std::vector<float> rotation1,rotation2,rotation3;
-	std::vector<float> bigrotation;
-	std::vector<float> bigtilt;
-	std::vector<float> bigtilt2;
-	std::vector<float> smallrotation;
-	std::vector<float> smallrotation2;
+	float rotation1[max_weaponinstances];
+	float rotation2[max_weaponinstances];
+	float rotation3[max_weaponinstances];
+	float bigrotation[max_weaponinstances];
+	float bigtilt[max_weaponinstances];
+	float bigtilt2[max_weaponinstances];
+	float smallrotation[max_weaponinstances];
+	float smallrotation2[max_weaponinstances];
 
 	int numweapons;
-	std::vector<float> damage;
-	std::vector<XYZ> tippoint;
-	std::vector<XYZ> oldtippoint;
-	std::vector<XYZ> position;
-	std::vector<float> lastmult;
-	std::vector<XYZ> oldposition;
-	std::vector<XYZ> velocity;
-	std::vector<XYZ> tipvelocity;
-	std::vector<int> type;
-	std::vector<int> oldowner;
-	std::vector<int> owner;
-	std::vector<int> bloody;
-	std::vector<float> blooddrip;
-	std::vector<float> blooddripdelay;
-	std::vector<bool> onfire;
-	std::vector<float> flamedelay;
-	std::vector<bool> missed;
-	std::vector<float> mass;
-	std::vector<float> tipmass;
-	std::vector<float> length;
-	std::vector<float> freetime;
-	std::vector<bool> firstfree;
-	std::vector<bool> physics;
-	std::vector<float> drawhowmany;
-	std::vector<bool> hitsomething;
+	float damage[max_weaponinstances];
+	XYZ tippoint[max_weaponinstances];
+	XYZ oldtippoint[max_weaponinstances];
+	XYZ position[max_weaponinstances];
+	float lastmult[max_weaponinstances];
+	XYZ oldposition[max_weaponinstances];
+	XYZ velocity[max_weaponinstances];
+	XYZ tipvelocity[max_weaponinstances];
+	int type[max_weaponinstances];
+	int oldowner[max_weaponinstances];
+	int owner[max_weaponinstances];
+	int bloody[max_weaponinstances];
+	float blooddrip[max_weaponinstances];
+	float blooddripdelay[max_weaponinstances];
+	bool onfire[max_weaponinstances];
+	float flamedelay[max_weaponinstances];
+	bool missed[max_weaponinstances];
+	float mass[max_weaponinstances];
+	float tipmass[max_weaponinstances];
+	float length[max_weaponinstances];
+	float freetime[max_weaponinstances];
+	bool firstfree[max_weaponinstances];
+	bool physics[max_weaponinstances];
+	float drawhowmany[max_weaponinstances];
+	bool hitsomething[max_weaponinstances];
 
-	std::vector<XYZ> lastdrawnposition;
-	std::vector<XYZ> lastdrawntippoint;
-	std::vector<float> lastdrawnrotation1,lastdrawnrotation2,lastdrawnrotation3;
-	std::vector<float> lastdrawnbigrotation;
-	std::vector<float> lastdrawnbigtilt;
-	std::vector<float> lastdrawnbigtilt2;
-	std::vector<float> lastdrawnsmallrotation;
-	std::vector<float> lastdrawnsmallrotation2;
-	std::vector<int> lastdrawnanim;
+	XYZ lastdrawnposition[max_weaponinstances];
+	XYZ lastdrawntippoint[max_weaponinstances];
+	float lastdrawnrotation1[max_weaponinstances];
+	float lastdrawnrotation2[max_weaponinstances];
+	float lastdrawnrotation3[max_weaponinstances];
+	float lastdrawnbigrotation[max_weaponinstances];
+	float lastdrawnbigtilt[max_weaponinstances];
+	float lastdrawnbigtilt2[max_weaponinstances];
+	float lastdrawnsmallrotation[max_weaponinstances];
+	float lastdrawnsmallrotation2[max_weaponinstances];
+	int lastdrawnanim[max_weaponinstances];
 
 	Model throwingknifemodel;
 	GLuint knifetextureptr;
@@ -90,4 +94,4 @@ public:
 	~Weapons();
 };
 
-#endif
\ No newline at end of file
+#endif