Tiny bugfix. Crash on vid_reset while unspawned, sneak restored in default.cfg
This commit is contained in:
parent
d674fa4c14
commit
8c29795ebb
6 changed files with 20 additions and 5 deletions
|
@ -23,10 +23,11 @@ ClientGame_ConsoleCommand(void)
|
|||
|
||||
switch(argv(0)) {
|
||||
|
||||
case "+speed":
|
||||
// Can't be exactly "speed". No idea why.
|
||||
case "+speedcustom":
|
||||
pSeatLocal->m_iInputSpeed = TRUE;
|
||||
break;
|
||||
case "-speed":
|
||||
case "-speedcustom":
|
||||
pSeatLocal->m_iInputSpeed = FALSE;
|
||||
break;
|
||||
|
||||
|
@ -43,7 +44,7 @@ ClientGame_ConsoleCommand(void)
|
|||
case "useitems":
|
||||
TS_playerUseItems();
|
||||
//pSeatLocal->m_bUseItemsFreshPress = TRUE;
|
||||
//pSeatLocal->m_bUseItems = TRUE;
|
||||
pSeatLocal->m_bUseItems = TRUE;
|
||||
break;
|
||||
case "usepowerup":
|
||||
TS_playerUsePowerup();
|
||||
|
|
|
@ -211,7 +211,7 @@ ClientGame_RendererRestart(string rstr)
|
|||
|
||||
// TODO - if this becomes a lot of lines, go to a method
|
||||
// "pSeatLocal_RendererRestart" instead
|
||||
if(pl != NULL){
|
||||
if(pl != NULL && pl.iState == PLAYER_STATE::SPAWNED){
|
||||
pl.prev_iForceBodygroup1Submodel = 0;
|
||||
TS_View_SetViewModelFromStats();
|
||||
}
|
||||
|
|
|
@ -85,6 +85,11 @@ TS_View_SetViewModelFromStats(void)
|
|||
weapondata_basic_t* basicP;
|
||||
weapondynamic_t dynaRef;
|
||||
|
||||
if(pl.inventoryEquippedIndex == -1){
|
||||
// what.
|
||||
return;
|
||||
}
|
||||
|
||||
//printfline("TS_View_SetViewModelFromStats: I happen? activeweap:%d", pl.activeweapon);
|
||||
|
||||
basicP = pl.getEquippedWeaponData();
|
||||
|
|
|
@ -622,6 +622,7 @@ TS_playerUseItems(void){
|
|||
if(pl.inventoryEquippedIndex == -1){
|
||||
return;
|
||||
}
|
||||
|
||||
//_TS_playerUseItems();
|
||||
|
||||
|
||||
|
@ -633,6 +634,7 @@ TS_playerUseItems(void){
|
|||
// SHOULD NOT HAPPEN, should call the CSEv_ version instead
|
||||
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -366,6 +366,11 @@ void processInputs(void){
|
|||
//printfline("!!! SECO !!! (%d %d)", ((input_buttons & INPUT_BUTTON0)!=0), ((input_buttons & INPUT_BUTTON3)!=0));
|
||||
Weapons_Secondary();
|
||||
|
||||
// TEST!
|
||||
//if(!(pl.gflags & GF_SEMI_SECONDARY_TOGGLED)){
|
||||
// TS_playerUseItems();
|
||||
//}
|
||||
|
||||
pl.gflags |= GF_SEMI_SECONDARY_TOGGLED;
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,9 @@ bind "a" "+moveleft"
|
|||
bind "d" "+moveright"
|
||||
bind "SPACE" "+jump"
|
||||
bind "CTRL" "+duck"
|
||||
bind "SHIFT" "+speed"
|
||||
// And yes, this does have to be called "speedcustom" and not "speed".
|
||||
// I have no clue.
|
||||
bind "SHIFT" "+speedcustom"
|
||||
bind "0" "slot10"
|
||||
bind "1" "slot1"
|
||||
bind "2" "slot2"
|
||||
|
|
Loading…
Reference in a new issue