nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Resolved conflict (missed earlier).

Browse source
This commit is contained in:
Felix Ableitner 2012-09-15 15:28:15 +02:00
parent 17e628b083
commit dbfa7c10c2
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/abstract/Physical.cpp
View file

@ -98,12 +98,8 @@ Physical::getSpeed() const {
return vector(mBody->GetLinearVelocity());
}
/**
<<<<<<< HEAD
* Returns the rotation of the body as an SFML angle.
=======
* Returns the rotation of the body (converted to an SFML angle).
>>>>>>> origin/master
/**
* Returns the rotation of the body (converted to an SFML angle).
*/
float
Physical::getAngle() const {