zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-08 00:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some bad English

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-10 23:42:39 +02:00
parent b68e79e4bc
commit 1573e6fb49
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/blood/src/actor.cpp
View file

@ -4151,7 +4151,7 @@ static void checkCeilHit(DBloodActor* actor)
actor2->spr.flags |= 5;
#ifdef NOONE_EXTENSIONS
// add size shroom abilities
if ((actor->IsPlayerActor() && isShrinked(actor)) || (actor2->IsPlayerActor() && isGrown(actor2))) {
if ((actor->IsPlayerActor() && isShrunk(actor)) || (actor2->IsPlayerActor() && isGrown(actor2))) {
int mass1 = getDudeInfo(actor2->spr.type)->mass;
int mass2 = getDudeInfo(actor->spr.type)->mass;
@ -4237,7 +4237,7 @@ static void checkHit(DBloodActor* actor)
#ifdef NOONE_EXTENSIONS
// add size shroom abilities
if ((actor2->IsPlayerActor() && isShrinked(actor2)) || (actor->IsPlayerActor() && isGrown(actor)))
if ((actor2->IsPlayerActor() && isShrunk(actor2)) || (actor->IsPlayerActor() && isGrown(actor)))
{
if (actor->vel.X != 0 && actor2->IsDudeActor())
{
@ -4310,7 +4310,7 @@ static void checkFloorHit(DBloodActor* actor)
#ifdef NOONE_EXTENSIONS
// add size shroom abilities
if ((actor2->IsPlayerActor() && isShrinked(actor2)) || (actor->IsPlayerActor() && isGrown(actor)))
if ((actor2->IsPlayerActor() && isShrunk(actor2)) || (actor->IsPlayerActor() && isGrown(actor)))
{
int mass1 = getDudeInfo(actor->spr.type)->mass;
@ -4402,7 +4402,7 @@ static void checkFloorHit(DBloodActor* actor)
case kDudePlayer7:
case kDudePlayer8:
#ifdef NOONE_EXTENSIONS
if (pPlayer && !isShrinked(actor))
if (pPlayer && !isShrunk(actor))
#else
if (pPlayer)
#endif

4
source/games/blood/src/nnexts.cpp
View file

@ -4374,7 +4374,7 @@ bool condCheckPlayer(DBloodActor* aCond, int cmpOp, bool PUSH)
case 14: return condCmp(pPlayer->posture + 1, arg1, arg2, cmpOp);
case 46: return condCmp(pPlayer->sceneQav, arg1, arg2, cmpOp);
case 47: return (pPlayer->godMode || powerupCheck(pPlayer, kPwUpDeathMask));
case 48: return isShrinked(pPlayer->GetActor());
case 48: return isShrunk(pPlayer->GetActor());
case 49: return isGrown(pPlayer->GetActor());
}
@ -7478,7 +7478,7 @@ bool isGrown(DBloodActor* actor)
else return false;
}
bool isShrinked(DBloodActor* actor)
bool isShrunk(DBloodActor* actor)
{
if (powerupCheck(getPlayer(actor->spr.type - kDudePlayer1), kPwUpShrinkShroom) > 0) return true;
else if (actor->hasX() && actor->xspr.scale > 0 && actor->xspr.scale <= 128) return true;

2
source/games/blood/src/nnexts.h
View file

@ -357,7 +357,7 @@ void callbackGenDudeUpdate(DBloodActor* actor, sectortype* nSprite);
// ------------------------------------------------------------------------- //
DBloodPlayer* getPlayerById(int id);
bool isGrown(DBloodActor* pSprite);
bool isShrinked(DBloodActor* pSprite);
bool isShrunk(DBloodActor* pSprite);
bool IsBurningDude(DBloodActor* pSprite);
bool IsKillableDude(DBloodActor* pSprite);
bool isActive(DBloodActor* nSprite);

4
source/games/blood/src/player.cpp
View file

@ -295,7 +295,7 @@ bool powerupActivate(DBloodPlayer* pPlayer, int nPowerUp)
break;
case kItemShroomGrow:
if (!gModernMap) break;
else if (isShrinked(pPlayer->GetActor())) playerDeactivateShrooms(pPlayer);
else if (isShrunk(pPlayer->GetActor())) playerDeactivateShrooms(pPlayer);
else {
playerSizeGrow(pPlayer, 2);
if (powerupCheck(getPlayer(pPlayer->GetActor()->spr.type - kDudePlayer1), kPwUpShadowCloak) > 0) {
@ -1041,7 +1041,7 @@ bool PickupItem(DBloodPlayer* pPlayer, DBloodActor* itemactor)
if (gModernMap) {
switch (itemactor->spr.type) {
case kItemShroomShrink:
if (isShrinked(pPlayer->GetActor())) return false;
if (isShrunk(pPlayer->GetActor())) return false;
break;
case kItemShroomGrow:
if (isGrown(pPlayer->GetActor())) return false;