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

Browse source
This commit is contained in:
Paul 2001-05-11 01:58:36 +00:00
parent e67eb9cb21
commit d3d2e4bb39
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/level/layercollision.cpp
View file

@ -242,7 +242,7 @@ ColShowType showCollision=SHOW_NONE;
#endif #endif
void CLayerCollision::render(DVECTOR &MapPos) void CLayerCollision::render(DVECTOR &MapPos)
{ {
if(PadGetDown(0)&PAD_TRIANGLE) if(PadGetDown(0)&PAD_CIRCLE)
{ {
showCollision=(ColShowType)(showCollision+1); showCollision=(ColShowType)(showCollision+1);
if(showCollision>SHOW_SEMITRANS)showCollision=SHOW_NONE; if(showCollision>SHOW_SEMITRANS)showCollision=SHOW_NONE;

19
source/player/player.cpp
View file

@ -638,7 +638,10 @@ else if(oldmode!=-1&&!(PadGetHeld(0)&PAD_L1))
if(PadGetHeld(0)&PAD_L1&&PadGetHeld(0)&PAD_L2) if(PadGetHeld(0)&PAD_L1&&PadGetHeld(0)&PAD_L2)
{ {
CGameScene::restartlevel(); if(m_currentMode!=PLAYER_MODE_DEAD)
{
dieYouPorousFreak();
}
} }
if(newmode!=-1) if(newmode!=-1)
{ {
@ -1367,14 +1370,14 @@ void CPlayer::calcCameraFocusPointTarget()
void CPlayer::respawn() void CPlayer::respawn()
{ {
// Strip any items that the player might be holding // Strip any items that the player might be holding
if(m_currentMode!=PLAYER_MODE_BASICUNARMED) // if(m_currentMode!=PLAYER_MODE_BASICUNARMED)
{ // {
setMode(PLAYER_MODE_FULLUNARMED); setMode(PLAYER_MODE_FULLUNARMED);
} // }
else // else
{ // {
setMode(PLAYER_MODE_BASICUNARMED); // setMode(PLAYER_MODE_BASICUNARMED);
} // }
m_allowConversation=false; m_allowConversation=false;

6
source/player/pmdead.cpp
View file

@ -17,6 +17,10 @@
#include "player\pmdead.h" #include "player\pmdead.h"
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
/* Std Lib /* Std Lib
------- */ ------- */
@ -76,7 +80,7 @@ m_player->moveVertical(5);
if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)|| if((m_deadTime>DEATH_DELAY&&m_player->getPadInputDown()&PI_FIRE)||
m_deadTime>DEATH_TIMEOUT) m_deadTime>DEATH_TIMEOUT)
{ {
respawn(); CGameScene::restartlevel();
} }
} }