zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Combination switches fix (and basically all event commands)

Browse source 
- No sound of jumping when player's jump velocity is too low
This commit is contained in:
NoOneBlood 2020-01-04 03:20:41 +03:00 committed by Christoph Oelckers
parent dc5b8d27f8
commit 6f3ccdc651
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/blood/src/eventq.cpp
View file

@ -353,7 +353,7 @@ char evGetSourceState(int nType, int nIndex)
void evSend(int nIndex, int nType, int rxId, COMMAND_ID command, short causedBy) void evSend(int nIndex, int nType, int rxId, COMMAND_ID command, short causedBy)
{ {
EVENT event; event.index = nIndex; event.type = nType; event.cmd = command; event.causedBy = causedBy;
switch (command) { switch (command) {
case kCmdState: case kCmdState:
@ -366,6 +366,12 @@ void evSend(int nIndex, int nType, int rxId, COMMAND_ID command, short causedBy)
break; break;
} }
EVENT event;
event.index = nIndex;
event.type = nType;
event.cmd = command;
event.causedBy = causedBy;
switch (rxId) { switch (rxId) {
case kChannelTextOver: case kChannelTextOver:
if (command >= kCmdNumberic) trTextOver(command - kCmdNumberic); if (command >= kCmdNumberic) trTextOver(command - kCmdNumberic);

2
source/blood/src/player.cpp
View file

@ -1578,7 +1578,9 @@ void ProcessInput(PLAYER *pPlayer)
break; break;
default: default:
if (!pPlayer->cantJump && pInput->buttonFlags.jump && pXSprite->height == 0) { if (!pPlayer->cantJump && pInput->buttonFlags.jump && pXSprite->height == 0) {
if ((packItemActive(pPlayer, 4) && pPosture->pwupJumpZ > 1000) || pPosture->normalJumpZ > 1000)
sfxPlay3DSound(pSprite, 700, 0, 0); sfxPlay3DSound(pSprite, 700, 0, 0);
if (packItemActive(pPlayer, 4)) zvel[nSprite] = pPosture->pwupJumpZ; //-0x175555; if (packItemActive(pPlayer, 4)) zvel[nSprite] = pPosture->pwupJumpZ; //-0x175555;
else zvel[nSprite] = pPosture->normalJumpZ; //-0xbaaaa; else zvel[nSprite] = pPosture->normalJumpZ; //-0xbaaaa;
pPlayer->cantJump = 1; pPlayer->cantJump = 1;