diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp index ed8a40016..5edb54c67 100644 --- a/TR5Main/Game/Lara/lara.cpp +++ b/TR5Main/Game/Lara/lara.cpp @@ -25,6 +25,7 @@ #include "input.h" #include "sound.h" #include "setup.h" +#include "pickup.h" #include "motorbike.h" #include "cannon.h" @@ -1902,27 +1903,9 @@ void lara_as_switchon(ITEM_INFO* item, COLL_INFO* coll)//1ABEC(<), 1AD20(<) (F) Camera.speed = 6; } -void lara_as_pickupflare(ITEM_INFO* item, COLL_INFO* coll)//1AB5C(<), 1AC90(<) (F) -{ - Lara.look = false; - coll->enableBaddiePush = false; - coll->enableSpaz = false; - Camera.targetAngle = ANGLE(130.0f); - Camera.targetElevation = -ANGLE(15.0f); - Camera.targetDistance = SECTOR(1); - if (item->frameNumber == g_Level.Anims[item->animNumber].frameEnd - 1) - Lara.gunStatus = LG_NO_ARMS; -} -void lara_as_pickup(ITEM_INFO* item, COLL_INFO* coll)//1AB00(<), 1AC34(<) (F) -{ - Lara.look = false; - coll->enableBaddiePush = false; - coll->enableSpaz = false; - Camera.targetAngle = -ANGLE(130.0f); - Camera.targetElevation = -ANGLE(15.0f); - Camera.targetDistance = SECTOR(1); -} + + void lara_as_ppready(ITEM_INFO* item, COLL_INFO* coll)//1AABC(<), 1ABF0(<) (F) { diff --git a/TR5Main/Game/Lara/lara.h b/TR5Main/Game/Lara/lara.h index 0dff02eac..594e945c4 100644 --- a/TR5Main/Game/Lara/lara.h +++ b/TR5Main/Game/Lara/lara.h @@ -74,8 +74,6 @@ void lara_as_usepuzzle(ITEM_INFO* item, COLL_INFO* coll); void lara_as_usekey(ITEM_INFO* item, COLL_INFO* coll); void lara_as_switchoff(ITEM_INFO* item, COLL_INFO* coll); void lara_as_switchon(ITEM_INFO* item, COLL_INFO* coll); -void lara_as_pickupflare(ITEM_INFO* item, COLL_INFO* coll); -void lara_as_pickup(ITEM_INFO* item, COLL_INFO* coll); void lara_as_ppready(ITEM_INFO* item, COLL_INFO* coll); void lara_as_pullblock(ITEM_INFO* item, COLL_INFO* coll); void lara_as_pushblock(ITEM_INFO* item, COLL_INFO* coll); @@ -132,29 +130,12 @@ void lara_as_poleright(ITEM_INFO* item, COLL_INFO* coll); void lara_as_poleleft(ITEM_INFO* item, COLL_INFO* coll); void lara_col_polestat(ITEM_INFO* item, COLL_INFO* coll); - - - void lara_col_dashdive(ITEM_INFO* item, COLL_INFO* coll); void lara_as_dashdive(ITEM_INFO* item, COLL_INFO* coll); void lara_col_dash(ITEM_INFO* item, COLL_INFO* coll); void lara_as_dash(ITEM_INFO* item, COLL_INFO* coll); void lara_col_crawl2hang(ITEM_INFO* item, COLL_INFO* coll); - - - - - - - - - - - - - - void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll); void LaraSlideEdgeJump(ITEM_INFO* item, COLL_INFO* coll); void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll); diff --git a/TR5Main/Game/pickup.cpp b/TR5Main/Game/pickup.cpp index bcc8c03fc..0dd4d61c5 100644 --- a/TR5Main/Game/pickup.cpp +++ b/TR5Main/Game/pickup.cpp @@ -1283,4 +1283,31 @@ void SearchObjectControl(short itemNumber) item->status = ITEM_NOT_ACTIVE; } } -} \ No newline at end of file +} + +/*Lara pickup state code*/ +void lara_as_pickup(ITEM_INFO* item, COLL_INFO* coll)//1AB00(<), 1AC34(<) (F) +{ + /*state 39, 98*/ + /*collision: lara_default_col*/ + Lara.look = false; + coll->enableBaddiePush = false; + coll->enableSpaz = false; + Camera.targetAngle = -ANGLE(130.0f); + Camera.targetElevation = -ANGLE(15.0f); + Camera.targetDistance = SECTOR(1); +} + +void lara_as_pickupflare(ITEM_INFO* item, COLL_INFO* coll)//1AB5C(<), 1AC90(<) (F) +{ + /*state 67*/ + /*collison: lara_default_col*/ + Lara.look = false; + coll->enableBaddiePush = false; + coll->enableSpaz = false; + Camera.targetAngle = ANGLE(130.0f); + Camera.targetElevation = -ANGLE(15.0f); + Camera.targetDistance = SECTOR(1); + if (item->frameNumber == g_Level.Anims[item->animNumber].frameEnd - 1) + Lara.gunStatus = LG_NO_ARMS; +} diff --git a/TR5Main/Game/pickup.h b/TR5Main/Game/pickup.h index aad3a2be7..9be70f1ca 100644 --- a/TR5Main/Game/pickup.h +++ b/TR5Main/Game/pickup.h @@ -17,4 +17,5 @@ void InitialiseSearchObject(short itemNumber); void SearchObjectCollision(short itemNumber, ITEM_INFO* laraitem, COLL_INFO* laracoll); void SearchObjectControl(short itemNumber); void do_pickup(); - +void lara_as_pickup(ITEM_INFO* item, COLL_INFO* coll); +void lara_as_pickupflare(ITEM_INFO* item, COLL_INFO* coll);