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-01-30 15:02:01 +00:00
parent 4481e55b98
commit accb9f32a5
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/enemy/npc.cpp
View file

@ -1338,7 +1338,7 @@ void CNpc::processEvent( GAME_EVENT evt, CThing *sourceThing )
yDiffSqr = this->Pos.vy - sourcePos.vy; yDiffSqr = this->Pos.vy - sourcePos.vy;
yDiffSqr *= yDiffSqr; yDiffSqr *= yDiffSqr;
if ( xDiffSqr + yDiffSqr < 250 ) if ( xDiffSqr + yDiffSqr < 10000 )
{ {
if( !CConversation::isActive() ) if( !CConversation::isActive() )
{ {

11
source/player/player.cpp
View file

@ -29,6 +29,10 @@
#include "game\gameslot.h" #include "game\gameslot.h"
#endif #endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
// to be removed // to be removed
#include "gfx\tpage.h" #include "gfx\tpage.h"
@ -136,8 +140,6 @@ if(newmode!=-1)
newmode=-1; newmode=-1;
} }
#ifndef __USER_paul__ #ifndef __USER_paul__
int padInput=PadGetHeld(0); int padInput=PadGetHeld(0);
int move=7*_frames; int move=7*_frames;
@ -146,6 +148,11 @@ if(newmode!=-1)
if(padInput&PAD_LEFT) Pos.vx-=move; if(padInput&PAD_LEFT) Pos.vx-=move;
if(padInput&PAD_RIGHT) Pos.vx+=move; if(padInput&PAD_RIGHT) Pos.vx+=move;
m_invincibleFrameCount=0; m_invincibleFrameCount=0;
if ( padInput & PAD_UP ) // not sure where you want to put this, Paul (Charles)
{
GameScene.sendEvent( USER_REQUEST_TALK_EVENT, this );
}
#else #else
if(_frames>=3)_frames=2; if(_frames>=3)_frames=2;