X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.cpp;h=d67044eee0923ea543436805384068352c0cf457;hb=44146d06c780d3aaa283672fedb08b8870ebe1b9;hp=cc6008b409cf7389ccc68a5ffc16c9c0f274aaea;hpb=43f08119f2408a487dbefcf670bb6c8f47d4c49b;p=lugaru.git

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index cc6008b..d67044e 100644
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include "Objects.h"
 extern XYZ viewer;
 extern float viewdistance;
@@ -97,26 +118,26 @@ void Objects::Draw()
 								if(type[i]==bushtype){
 									messedwith[i]-=multiplier;
 									if(rotxvel[i]||rotx[i]){
-										if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-										if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+										if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+										if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
 										if(rotx[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotx[i]<0)rotxvel[i]+=multiplier*4;
 										if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-										if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-										if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+										if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+										if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
 										rotx[i]+=rotxvel[i]*multiplier*4;
 									}
 									if(rotyvel[i]||roty[i]){
-										if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-										if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+										if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+										if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
 										if(roty[i]>0)rotyvel[i]-=multiplier*4;
 										if(roty[i]<0)rotyvel[i]+=multiplier*4;
 										if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
 										if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-										if(abs(roty[i])<multiplier*4)roty[i]=0;
-										if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+										if(fabs(roty[i])<multiplier*4)roty[i]=0;
+										if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
 										roty[i]+=rotyvel[i]*multiplier*4;
 									}
@@ -135,26 +156,26 @@ void Objects::Draw()
 									if(type[i]==treetrunktype||environment==2){
 										messedwith[i]-=multiplier;
 										if(rotxvel[i]||rotx[i]){
-											if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-											if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+											if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+											if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
 											if(rotx[i]>0)rotxvel[i]-=multiplier*4;
 											if(rotx[i]<0)rotxvel[i]+=multiplier*4;
 											if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
 											if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-											if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-											if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+											if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+											if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
 											rotx[i]+=rotxvel[i]*multiplier*4;
 										}
 										if(rotyvel[i]||roty[i]){
-											if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-											if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+											if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+											if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
 											if(roty[i]>0)rotyvel[i]-=multiplier*4;
 											if(roty[i]<0)rotyvel[i]+=multiplier*4;
 											if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
 											if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-											if(abs(roty[i])<multiplier*4)roty[i]=0;
-											if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+											if(fabs(roty[i])<multiplier*4)roty[i]=0;
+											if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
 											roty[i]+=rotyvel[i]*multiplier*4;
 										}
@@ -173,26 +194,26 @@ void Objects::Draw()
 									{
 										messedwith[i]-=multiplier;
 										if(rotxvel[i]||rotx[i]){
-											if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-											if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+											if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+											if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
 											if(rotx[i]>0)rotxvel[i]-=multiplier*4;
 											if(rotx[i]<0)rotxvel[i]+=multiplier*4;
 											if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
 											if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-											if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-											if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+											if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+											if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
 											rotx[i]+=rotxvel[i]*multiplier*4;
 										}
 										if(rotyvel[i]||roty[i]){
-											if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-											if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+											if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+											if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
 											if(roty[i]>0)rotyvel[i]-=multiplier*4;
 											if(roty[i]<0)rotyvel[i]+=multiplier*4;
 											if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
 											if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-											if(abs(roty[i])<multiplier*4)roty[i]=0;
-											if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+											if(fabs(roty[i])<multiplier*4)roty[i]=0;
+											if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
 											roty[i]+=rotyvel[i]*multiplier*4;
 										}
@@ -324,26 +345,26 @@ void Objects::Draw()
 								if(type[i]==bushtype){
 									messedwith[i]-=multiplier;
 									if(rotxvel[i]||rotx[i]){
-										if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-										if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+										if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+										if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
 										if(rotx[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotx[i]<0)rotxvel[i]+=multiplier*4;
 										if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-										if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-										if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+										if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+										if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
 										rotx[i]+=rotxvel[i]*multiplier*4;
 									}
 									if(rotyvel[i]||roty[i]){
-										if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-										if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+										if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+										if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
 										if(roty[i]>0)rotyvel[i]-=multiplier*4;
 										if(roty[i]<0)rotyvel[i]+=multiplier*4;
 										if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
 										if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-										if(abs(roty[i])<multiplier*4)roty[i]=0;
-										if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+										if(fabs(roty[i])<multiplier*4)roty[i]=0;
+										if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
 										roty[i]+=rotyvel[i]*multiplier*4;
 									}
@@ -361,26 +382,26 @@ void Objects::Draw()
 								if(type[i]==treetrunktype||type[i]==treeleavestype){
 									messedwith[i]-=multiplier;
 									if(rotxvel[i]||rotx[i]){
-										if(rotx[i]>0)rotxvel[i]-=multiplier*8*abs(rotx[i]);
-										if(rotx[i]<0)rotxvel[i]+=multiplier*8*abs(rotx[i]);
+										if(rotx[i]>0)rotxvel[i]-=multiplier*8*fabs(rotx[i]);
+										if(rotx[i]<0)rotxvel[i]+=multiplier*8*fabs(rotx[i]);
 										if(rotx[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotx[i]<0)rotxvel[i]+=multiplier*4;
 										if(rotxvel[i]>0)rotxvel[i]-=multiplier*4;
 										if(rotxvel[i]<0)rotxvel[i]+=multiplier*4;
-										if(abs(rotx[i])<multiplier*4)rotx[i]=0;
-										if(abs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
+										if(fabs(rotx[i])<multiplier*4)rotx[i]=0;
+										if(fabs(rotxvel[i])<multiplier*4)rotxvel[i]=0;
 
 										rotx[i]+=rotxvel[i]*multiplier*4;
 									}
 									if(rotyvel[i]||roty[i]){
-										if(roty[i]>0)rotyvel[i]-=multiplier*8*abs(roty[i]);
-										if(roty[i]<0)rotyvel[i]+=multiplier*8*abs(roty[i]);
+										if(roty[i]>0)rotyvel[i]-=multiplier*8*fabs(roty[i]);
+										if(roty[i]<0)rotyvel[i]+=multiplier*8*fabs(roty[i]);
 										if(roty[i]>0)rotyvel[i]-=multiplier*4;
 										if(roty[i]<0)rotyvel[i]+=multiplier*4;
 										if(rotyvel[i]>0)rotyvel[i]-=multiplier*4;
 										if(rotyvel[i]<0)rotyvel[i]+=multiplier*4;
-										if(abs(roty[i])<multiplier*4)roty[i]=0;
-										if(abs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
+										if(fabs(roty[i])<multiplier*4)roty[i]=0;
+										if(fabs(rotyvel[i])<multiplier*4)rotyvel[i]=0;
 
 										roty[i]+=rotyvel[i]*multiplier*4;
 									}
@@ -467,7 +488,7 @@ void Objects::DeleteObject(int which)
 void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 	if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
 		scale[numobjects]=ascale;
-		if(atype==treeleavestype)scale[numobjects]+=abs((float)(Random()%100)/900)*ascale;
+		if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
 
 		onfire[numobjects]=0;
 		flamedelay[numobjects]=0;
@@ -550,7 +571,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float ascale){
 void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2, float ascale){
 	if((atype!=treeleavestype&&atype!=bushtype)||foliage==1){
 		scale[numobjects]=ascale;
-		if(atype==treeleavestype)scale[numobjects]+=abs((float)(Random()%100)/900)*ascale;
+		if(atype==treeleavestype)scale[numobjects]+=fabs((float)(Random()%100)/900)*ascale;
 
 		onfire[numobjects]=0;
 		flamedelay[numobjects]=0;
@@ -597,7 +618,7 @@ void Objects::MakeObject(int atype, XYZ where, float arotation, float arotation2
 		if(atype==treetrunktype)friction[numobjects]=.4;
 		if(atype==treeleavestype)friction[numobjects]=0;
 
-		if(friction[numobjects]==1.5&&abs(arotation2)>5)friction[numobjects]=.5;
+		if(friction[numobjects]==1.5&&fabs(arotation2)>5)friction[numobjects]=.5;
 
 		if(atype==platformtype){
 			model[numobjects].loaddecal((char *)":Data:Models:Platform.solid",0);