Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3933/src
Modified Files:
player.cpp sector.cpp
Log Message:
added some more non-45 degree triangle modes
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- player.cpp 25 Nov 2004 15:41:28 -0000 1.207
+++ player.cpp 25 Nov 2004 16:38:30 -0000 1.208
@@ -857,10 +857,6 @@
HitResponse
Player::collision(GameObject& other, const CollisionHit& hit)
{
- if(dying) {
- return FORCE_MOVE;
- }
-
if(other.get_flags() & FLAG_SOLID) {
if(hit.normal.y < 0) { // landed on floor?
if (physic.get_velocity_y() < 0)
Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sector.cpp 25 Nov 2004 11:16:02 -0000 1.48
+++ sector.cpp 25 Nov 2004 16:38:31 -0000 1.49
@@ -673,23 +673,7 @@
AATriangle triangle;
Vector p1(x*32, y*32);
Vector p2((x+1)*32, (y+1)*32);
- switch(tile->data) {
- case 0:
- triangle = AATriangle(p1, p2, AATriangle::SOUTHWEST);
- break;
- case 1:
- triangle = AATriangle(p1, p2, AATriangle::NORTHEAST);
- break;
- case 2:
- triangle = AATriangle(p1, p2, AATriangle::SOUTHEAST);
- break;
- case 3:
- triangle = AATriangle(p1, p2, AATriangle::NORTHWEST);
- break;
- default:
- printf("Invalid slope angle in tile %d !\n", tile->id);
- break;
- }
+ triangle = AATriangle(p1, p2, tile->data);
if(Collision::rectangle_aatriangle(temphit, dest, object->movement,
triangle)) {
|
