zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-23 17:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made some annotations in concmd_shoot how to deal with RRRA's merged projectiles.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-22 12:36:16 +01:00
parent 712ed44e94
commit ea96c66a93
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/gameexec.cpp
View file

@ -1691,10 +1691,22 @@ int ParseState::parse(void)
insptr++;
break;
case concmd_shoot:
{
insptr++;
shoot(g_ac, (short)*insptr, nullptr);
int type = *insptr;
// hackery to separate RRRA's merged projectiles. We'd prefer not to keep this mess in the core implementation.
// Separating it here is easiest as long as the ZScript reimplementation explicitly takes care of these differences.
if (isRRRA())
{
//if (g_ac->GetClass.TypeName == NAME_RedneckCheerleader && type == 3400) typecls = PClass::FindActor(NAME_RedneckCheerBaton);
//if (g_ac->GetClass.TypeName == NAME_RedneckMama && type == 3390) typecls = PClass::FindActor(NAME_RedneckRabbitBall);
//if (g_ac->GetClass.TypeName == NAME_RedneckMinion && type == 3390 && g_ac->spr.pal == 8) typecls = PClass::FindActor(NAME_RedneckFrogBall);
//if (g_ac->GetClass.TypeName == NAME_RedneckMinion && type == 3390 && g_ac->spr.pal == 19)) typecls = PClass::FindActor(NAME_RedneckShitBurn);
}
shoot(g_ac, *insptr, nullptr);
insptr++;
break;
}
case concmd_ifsoundid:
insptr++;
parseifelse((short)*insptr == ambienttags.SafeGet(g_ac->spr.detail, {}).lo);