zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-04-10 20:08:23 +00:00
parent 96dd1440e6
commit 315868c4fb
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/player/player.cpp
View file

@ -873,7 +873,7 @@ PLAYERINPUT CPlayer::readPadInput()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CPlayer::shove( DVECTOR move ) /*void CPlayer::shove( DVECTOR move )
{ {
int colHeight; int colHeight;
@ -944,7 +944,7 @@ void CPlayer::shove( DVECTOR move )
// No obstruction // No obstruction
Pos.vy+=move.vy; Pos.vy+=move.vy;
} }
} }*/
void CPlayer::setPlatform(CThing *_newPlatform) void CPlayer::setPlatform(CThing *_newPlatform)
{ {

2
source/player/player.h
View file

@ -138,7 +138,7 @@ public:
virtual void shutdown(); virtual void shutdown();
virtual void think(int _frames); virtual void think(int _frames);
virtual void render(); virtual void render();
virtual void shove(DVECTOR move); //virtual void shove(DVECTOR move);
virtual void setHasPlatformCollided( bool newVal ); virtual void setHasPlatformCollided( bool newVal );
virtual bool getHasPlatformCollided(); virtual bool getHasPlatformCollided();

8
source/thing/thing.cpp
View file

@ -136,12 +136,12 @@ void CThingManager::thinkAllThings(int _frames)
{ {
//if ( !thing1->hasChild( thing2 ) ) //if ( !thing1->hasChild( thing2 ) )
{ {
thing1->removeAllChild(); //thing1->removeAllChild();
if(thing1->canCollide()&& if(thing1->canCollide()&&
thing1->checkCollisionAgainst(thing2, _frames)) thing1->checkCollisionAgainst(thing2, _frames))
{ {
thing1->addChild( thing2 ); //thing1->addChild( thing2 );
thing1->collidedWith(thing2); thing1->collidedWith(thing2);
} }
@ -729,11 +729,11 @@ void CThing::processEvent(GAME_EVENT _event,CThing *_sourceThing)
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CThing::shove( DVECTOR move ) /*void CThing::shove( DVECTOR move )
{ {
Pos.vx += move.vx; Pos.vx += move.vx;
Pos.vy += move.vy; Pos.vy += move.vy;
} }*/
/*=========================================================================== /*===========================================================================
end */ end */

2
source/thing/thing.h
View file

@ -111,7 +111,7 @@ public:
DVECTOR getPos() {return Pos;} DVECTOR getPos() {return Pos;}
void setPos(DVECTOR newPos) {Pos=newPos;} void setPos(DVECTOR newPos) {Pos=newPos;}
DVECTOR getPosDelta() {return PosDelta;} DVECTOR getPosDelta() {return PosDelta;}
virtual void shove(DVECTOR move); //virtual void shove(DVECTOR move);
CThing *getNext() {return Next;} CThing *getNext() {return Next;}