[Planeshift-cvs] CVS: planeshift/src/common/psprop/imp pslinmove.cpp,1.70,1.71

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/psprop/imp
In directory sc8-pr-cvs1:/tmp/cvs-serv25579/src/common/psprop/imp

Modified Files:
	pslinmove.cpp 
Log Message:
-Removed some code that created compiler warnigs.


Index: pslinmove.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/psprop/imp/pslinmove.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** pslinmove.cpp	6 Mar 2003 06:39:29 -0000	1.70
--- pslinmove.cpp	7 Mar 2003 19:00:58 -0000	1.71
***************
*** 236,245 ****
  }
  
- 
- #ifndef min(a,b)
- #define min(a,b) (((a)<(b))?(a):(b))
- #define max(a,b) (((a)>(b))?(a):(b))
- #endif
- 
  //Does the actual rotation
  bool celPcLinearMovement::RotateV (float delta)
--- 236,239 ----
***************
*** 253,257 ****
              float angle = pccamera->GetPitch();
  	    angle += camera_pitchspeed*speed;
!             pccamera->SetPitch(min(max(angle,-3.14159/2),3.14159/2) );
          }
      }
--- 247,251 ----
              float angle = pccamera->GetPitch();
  	    angle += camera_pitchspeed*speed;
!             pccamera->SetPitch(MIN(MAX(angle,-3.14159/2),3.14159/2) );
          }
      }