Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-02 17:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change return type of deflect functions to bool; rename LaraDeflectEdgeDuck() to LaraDeflectEdgeCrawl()

Browse source
This commit is contained in:
Sezz 2021-11-11 23:46:59 +11:00
parent f926bfe70c
commit 4b9205c653
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TR5Main/Game/Lara/lara_collide.cpp
View file

@ -16,7 +16,7 @@
/*this file has all the generic **collision** test functions called in lara's state code*/
int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll)
bool LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType == CT_FRONT || coll->CollisionType == CT_TOP_FRONT)
{
@ -26,7 +26,7 @@ int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll)
item->speed = 0;
item->gravityStatus = false;
return 1;
return true;
}
if (coll->CollisionType == CT_LEFT)
@ -40,7 +40,7 @@ int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll)
item->pos.yRot -= ANGLE(coll->DiagonalStepAtRight() ? DEFLECT_DIAGONAL_ANGLE : DEFLECT_STRAIGHT_ANGLE);
}
return 0;
return false;
}
void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll)
@ -106,7 +106,7 @@ void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll)
}
}
int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll)
bool LaraDeflectEdgeCrawl(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType == CT_FRONT || coll->CollisionType == CT_TOP_FRONT)
{
@ -115,7 +115,7 @@ int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll)
item->gravityStatus = false;
item->speed = 0;
return 1;
return true;
}
if (coll->CollisionType == CT_LEFT)
@ -129,10 +129,10 @@ int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll)
item->pos.yRot -= ANGLE(2.0f);
}
return 0;
return false;
}
int LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll)
bool LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType == CT_TOP || coll->CollisionType == CT_CLAMP)
{
@ -150,9 +150,10 @@ int LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll)
item->fallspeed = 0;
item->gravityStatus = false;
return 1;
return true;
}
return 0;
return false;
}
void LaraCollideStop(ITEM_INFO* item, COLL_INFO* coll)

6
TR5Main/Game/Lara/lara_collide.h
View file

@ -5,10 +5,10 @@ struct COLL_INFO;
constexpr auto DEFLECT_STRAIGHT_ANGLE = 5.0f;
constexpr auto DEFLECT_DIAGONAL_ANGLE = 12.0f;
int LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll);
bool LaraDeflectEdge(ITEM_INFO* item, COLL_INFO* coll);
void LaraDeflectEdgeJump(ITEM_INFO* item, COLL_INFO* coll);
int LaraDeflectEdgeDuck(ITEM_INFO* item, COLL_INFO* coll);
int LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);
bool LaraDeflectEdgeCrawl(ITEM_INFO* item, COLL_INFO* coll);
bool LaraHitCeiling(ITEM_INFO* item, COLL_INFO* coll);
void LaraCollideStop(ITEM_INFO* item, COLL_INFO* coll);
void LaraSnapToEdgeOfBlock(ITEM_INFO* item, COLL_INFO* coll, short angle);
void LaraResetGravityStatus(ITEM_INFO* item, COLL_INFO* coll);

4
TR5Main/Game/Lara/lara_crawl.cpp
View file

@ -567,7 +567,7 @@ void lara_col_crawl(ITEM_INFO* item, COLL_INFO* coll)
GetCollisionInfo(coll, item, true);
if (LaraDeflectEdgeDuck(item, coll))
if (LaraDeflectEdgeCrawl(item, coll))
{
item->currentAnimState = LS_CRAWL_IDLE;
item->goalAnimState = LS_CRAWL_IDLE;
@ -710,7 +710,7 @@ void lara_col_crawlb(ITEM_INFO* item, COLL_INFO* coll)
GetCollisionInfo(coll, item, true);
if (LaraDeflectEdgeDuck(item, coll))
if (LaraDeflectEdgeCrawl(item, coll))
{
item->currentAnimState = LS_CRAWL_IDLE;
item->goalAnimState = LS_CRAWL_IDLE;