From 16848eefa02909bebe66a94501c8ecca6a1c7163 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 8 Mar 2001 21:04:11 +0000 Subject: [PATCH] --- source/thing/thing.cpp | 5 +---- source/thing/thing.h | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/thing/thing.cpp b/source/thing/thing.cpp index 443beccef..8e4b99fba 100644 --- a/source/thing/thing.cpp +++ b/source/thing/thing.cpp @@ -294,7 +294,7 @@ void CThing::init() // Add to thing list CThingManager::addToThingList(this); - setCollisionSize(200,20); // Some temporary defaults.. (pkg) + setCollisionSize(20,20); // Some temporary defaults.. (pkg) setCollisionCentreOffset(0,0); m_collisionAngle = 0; m_collisionStickyBoundary = 0; @@ -333,9 +333,6 @@ void CThing::think(int _frames) DVECTOR PosLast=Pos; PosDelta.vx=Pos.vx-PosLast.vx; PosDelta.vy=Pos.vy-PosLast.vy; - - m_collisionAngle++; - m_collisionAngle %= 4096; } /*---------------------------------------------------------------------- diff --git a/source/thing/thing.h b/source/thing/thing.h index e8bc8b71d..d6f590fa8 100644 --- a/source/thing/thing.h +++ b/source/thing/thing.h @@ -140,6 +140,7 @@ protected: void setCentreCollision(bool newCentreCollision) {m_centreCollision = newCentreCollision;} void setNewCollidedPos(DVECTOR newPos) {m_newCollidedPos = newPos;} void setCollisionStickyBoundary(int boundary) {m_collisionStickyBoundary = boundary;} + void setCollisionAngle(int newAngle) {m_collisionAngle = newAngle;} int getCollisionRadius() {return m_collisionRadius;} CRECT getCollisionArea() {return m_collisionArea;} DVECTOR getCollisionCentre() {return m_collisionCentre;}