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

Browse source
This commit is contained in:
Daveo 2001-08-21 17:21:53 +00:00
parent 62c0fd8e93
commit 19bbb65f60
2 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
makefile.gaz
View file

@ -560,6 +560,8 @@ cddata:
ifeq ($(USER_NAME),CDBUILD) ifeq ($(USER_NAME),CDBUILD)
@$(MKDIR) -p $(CD_DIR) @$(MKDIR) -p $(CD_DIR)
@$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE) @$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE)
@$(CP) $(MAP_FILE) $(CD_DIR)/$(PROJ).map
@$(CP) $(SYM_FILE) $(CD_DIR)/$(PROJ).sym
@$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f @$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f
@$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX @$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX
@$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f @$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f

19
source/player/player.cpp
View file

@ -708,6 +708,7 @@ void CPlayer::shutdown()
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
static int oldmode=-1; static int oldmode=-1;
int newmode=-1; int newmode=-1;
void CPlayer::think(int _frames) void CPlayer::think(int _frames)
{ {
int i; int i;
@ -842,20 +843,24 @@ if(newmode!=-1)
// over an item whilst unarmed, he automatically picks it up // over an item whilst unarmed, he automatically picks it up
m_tryingToAutomaticallyPickupWeapon=true; m_tryingToAutomaticallyPickupWeapon=true;
} }
if(m_currentMode!=PLAYER_MODE_CART && getPadInputDown()&PI_WEAPONCHANGE) bool CanChange=true;
{
// If already armed then drop current weapon
if(m_currentMode!=PLAYER_MODE_BASICUNARMED)
{
switch(m_currentPlayerModeClass->getState()) switch(m_currentPlayerModeClass->getState())
{ {
case STATE_BUTTBOUNCE: case STATE_BUTTBOUNCE:
case STATE_BUTTFALL: case STATE_BUTTFALL:
case STATE_BUTTLAND: case STATE_BUTTLAND:
case STATE_BUTTBOUNCEUP: case STATE_BUTTBOUNCEUP:
CanChange=false;
break; break;
default: default:
break;
}
if(CanChange && (m_currentMode!=PLAYER_MODE_CART && getPadInputDown()&PI_WEAPONCHANGE))
{
// If already armed then drop current weapon
if(m_currentMode!=PLAYER_MODE_BASICUNARMED)
{ {
static const int s_pickupsToDrop[NUM_PLAYERMODES]= static const int s_pickupsToDrop[NUM_PLAYERMODES]=
{ {
@ -885,10 +890,6 @@ if(newmode!=-1)
((CBaseWeaponPickup*)pickup)->setHasBeenCollected(); ((CBaseWeaponPickup*)pickup)->setHasBeenCollected();
} }
setMode(PLAYER_MODE_BASICUNARMED); setMode(PLAYER_MODE_BASICUNARMED);
break;
}
}
} }
// Now trying to pick up a weapon.. // Now trying to pick up a weapon..