sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Accidental copying of triangles in collision checking loop.

Browse Source
This commit is contained in:
sigonasr2 2024-06-21 03:03:42 -05:00
parent 1f635a667d
commit abb18767d4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Adventures in Lestoria/StoneGolem.cpp
View File

@ -200,18 +200,18 @@ void Monster::STRATEGY::STONE_GOLEM(Monster&m,float fElapsedTime,std::string str
if(m.F(A::CASTING_TIMER)<=0.f){
game->SetupWorldShake(ConfigFloat("Shockwave.Shockwave Screen Shake Time"));
bool isSafe{false};
bool playerIsSafe{false};
for(std::any&data:m.VEC(A::STAGE_POLYGONS)){
std::vector<geom2d::triangle<float>>collisionTris{any_cast<StageMaskPolygon>(data).GetCollisionTriangles()};
for(geom2d::triangle<float>tri:collisionTris){
for(const geom2d::triangle<float>&tri:collisionTris){
if(geom2d::overlaps(game->GetPlayer()->Hitbox(),tri)){
isSafe=true;
playerIsSafe=true;
goto DoneWithCollisionCheck;
}
}
}
DoneWithCollisionCheck:
if(!isSafe){
if(!playerIsSafe){
game->GetPlayer()->Hurt(ConfigInt("Shockwave.Damage"),m.OnUpperLevel(),m.GetZ());
game->GetPlayer()->Knockback(util::pointTo(m.GetPos(),game->GetPlayer()->GetPos())*ConfigFloat("Shockwave.Knockback Amount"));
}

1
Adventures in Lestoria/TODO.txt
View File

@ -17,6 +17,7 @@ New Monster Sound Effects
Add a Helper Function: Change proximity knockback checks regardless of player/monster friendliness to be a function call instead.
Add rectangular hitbox posssibility to the game for monsters. (specifically for use with pillars)
DEMO
====