X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWeapons.cpp;h=e51b07b53cae40b60ab11778aa2e45cdaafd8f07;hb=67882279de8557e5bd2749bc64b1a6e573225ce9;hp=390dbd3bc36d71fb9db1f23ac3b529e965fec336;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 390dbd3..e51b07b 100644
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -670,7 +670,7 @@ void 	Weapons::DoStuff(){
 						else velocity[i]=0;
 						if(terrain.getOpacity(position[i].x,position[i].z)<.2)velocity[i]+=bounceness*elasticity*.3;
 						else velocity[i]+=bounceness*elasticity;
-
+//if (type[i]==knife) printf("velocity of knife %d now %f,%f,%f.\n", i, velocity[i].x, velocity[i].y, velocity[i].z);
 						if(findLengthfast(&bounceness)>1){
 							float gLoc[3];
 							float vel[3];
@@ -723,6 +723,7 @@ void 	Weapons::DoStuff(){
 						else tipvelocity[i]=0;
 						if(terrain.getOpacity(tippoint[i].x,tippoint[i].z)<.2)tipvelocity[i]+=bounceness*elasticity*.3;
 						else tipvelocity[i]+=bounceness*elasticity;
+//if (type[i]==knife) printf("tipvelocity of knife %d now %f,%f,%f.\n", i, tipvelocity[i].x, tipvelocity[i].y, tipvelocity[i].z);
 
 						if(findLengthfast(&bounceness)>1){
 							float gLoc[3];
@@ -1269,53 +1270,7 @@ int Weapons::Draw()
 
 Weapons::Weapons()
 {
-	rotation1.resize(max_weaponinstances);
-	rotation2.resize(max_weaponinstances);
-	rotation3.resize(max_weaponinstances);
-	bigrotation.resize(max_weaponinstances);
-	bigtilt.resize(max_weaponinstances);
-	bigtilt2.resize(max_weaponinstances);
-	smallrotation.resize(max_weaponinstances);
-	smallrotation2.resize(max_weaponinstances);
-	damage.resize(max_weaponinstances);
-
 	numweapons = 0;
-	tippoint.resize(max_weaponinstances);
-	oldtippoint.resize(max_weaponinstances);
-	position.resize(max_weaponinstances);
-	lastmult.resize(max_weaponinstances);
-	oldposition.resize(max_weaponinstances);
-	velocity.resize(max_weaponinstances);
-	tipvelocity.resize(max_weaponinstances);
-	type.resize(max_weaponinstances);
-	oldowner.resize(max_weaponinstances);
-	owner.resize(max_weaponinstances);
-	bloody.resize(max_weaponinstances);
-	blooddrip.resize(max_weaponinstances);
-	blooddripdelay.resize(max_weaponinstances);
-	onfire.resize(max_weaponinstances);
-	flamedelay.resize(max_weaponinstances);
-	missed.resize(max_weaponinstances);
-	mass.resize(max_weaponinstances);
-	tipmass.resize(max_weaponinstances);
-	length.resize(max_weaponinstances);
-	freetime.resize(max_weaponinstances);
-	firstfree.resize(max_weaponinstances);
-	physics.resize(max_weaponinstances);
-	drawhowmany.resize(max_weaponinstances);
-	hitsomething.resize(max_weaponinstances);
-
-	lastdrawnposition.resize(max_weaponinstances);
-	lastdrawntippoint.resize(max_weaponinstances);
-	lastdrawnrotation1.resize(max_weaponinstances);
-	lastdrawnrotation2.resize(max_weaponinstances);
-	lastdrawnrotation3.resize(max_weaponinstances);
-	lastdrawnbigrotation.resize(max_weaponinstances);
-	lastdrawnbigtilt.resize(max_weaponinstances);
-	lastdrawnbigtilt2.resize(max_weaponinstances);
-	lastdrawnsmallrotation.resize(max_weaponinstances);
-	lastdrawnsmallrotation2.resize(max_weaponinstances);
-	lastdrawnanim.resize(max_weaponinstances);
 
 	//		Model throwingknifemodel;
 	knifetextureptr = 0;
@@ -1333,12 +1288,12 @@ Weapons::Weapons()
 
 Weapons::~Weapons()
 {
-	if (stafftextureptr) glDeleteTextures( 1, (const unsigned long *)&stafftextureptr );
-	if (knifetextureptr) glDeleteTextures( 1, (const unsigned long *)&knifetextureptr );
-	if (lightbloodknifetextureptr) glDeleteTextures( 1, (const unsigned long *)&lightbloodknifetextureptr );
-	if (bloodknifetextureptr) glDeleteTextures( 1, (const unsigned long *)&bloodknifetextureptr );
-	if (swordtextureptr) glDeleteTextures( 1, (const unsigned long *)&swordtextureptr );
-	if (lightbloodswordtextureptr) glDeleteTextures( 1, (const unsigned long *)&lightbloodswordtextureptr );
-	if (bloodswordtextureptr) glDeleteTextures( 1, (const unsigned long *)&bloodswordtextureptr );
+	if (stafftextureptr) glDeleteTextures( 1, &stafftextureptr );
+	if (knifetextureptr) glDeleteTextures( 1, &knifetextureptr );
+	if (lightbloodknifetextureptr) glDeleteTextures( 1, &lightbloodknifetextureptr );
+	if (bloodknifetextureptr) glDeleteTextures( 1, &bloodknifetextureptr );
+	if (swordtextureptr) glDeleteTextures( 1, &swordtextureptr );
+	if (lightbloodswordtextureptr) glDeleteTextures( 1, &lightbloodswordtextureptr );
+	if (bloodswordtextureptr) glDeleteTextures( 1, &bloodswordtextureptr );
 }