mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 14:00:02 +00:00
fix
This commit is contained in:
parent
7388cc8a78
commit
a9ab3ea5b4
|
@ -46,7 +46,7 @@ enum {
|
||||||
|
|
||||||
struct CStoredDetailedAnimationState
|
struct CStoredDetailedAnimationState
|
||||||
{
|
{
|
||||||
uint8 aAnimId[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint16 aAnimId[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint8 aCurTime[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint8 aCurTime[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint8 aSpeed[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint8 aSpeed[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint8 aBlendAmount[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint8 aBlendAmount[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
|
@ -54,7 +54,7 @@ struct CStoredDetailedAnimationState
|
||||||
uint8 aFunctionCallbackID[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint8 aFunctionCallbackID[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint16 aFlags[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint16 aFlags[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint8 aGroupId[NUM_MAIN_ANIMS_IN_REPLAY];
|
uint8 aGroupId[NUM_MAIN_ANIMS_IN_REPLAY];
|
||||||
uint8 aAnimId2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
uint16 aAnimId2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
||||||
uint8 aCurTime2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
uint8 aCurTime2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
||||||
uint8 aSpeed2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
uint8 aSpeed2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
||||||
uint8 aBlendAmount2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
uint8 aBlendAmount2[NUM_PARTIAL_ANIMS_IN_REPLAY];
|
||||||
|
|
|
@ -81,7 +81,7 @@ void CRunningScript::LocatePlayerCommand(int32 command, uint32* pIp)
|
||||||
CVector pos = pPlayerInfo->GetPos();
|
CVector pos = pPlayerInfo->GetPos();
|
||||||
if (!decided) {
|
if (!decided) {
|
||||||
result = false;
|
result = false;
|
||||||
if (Abs(pos.x - X) < dX && Abs(pos.y - Y) < dY && (b3D || Abs(pos.z - Z) < dZ)) {
|
if (Abs(pos.x - X) < dX && Abs(pos.y - Y) < dY && (!b3D || Abs(pos.z - Z) < dZ)) {
|
||||||
switch (command) {
|
switch (command) {
|
||||||
case COMMAND_LOCATE_PLAYER_ANY_MEANS_2D:
|
case COMMAND_LOCATE_PLAYER_ANY_MEANS_2D:
|
||||||
case COMMAND_LOCATE_PLAYER_ANY_MEANS_3D:
|
case COMMAND_LOCATE_PLAYER_ANY_MEANS_3D:
|
||||||
|
@ -107,8 +107,8 @@ void CRunningScript::LocatePlayerCommand(int32 command, uint32* pIp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
UpdateCompareFlag(result && Abs(pos.x - X) < 80.0f && Abs(pos.y - Y) > 80.0f);
|
UpdateCompareFlag(result);
|
||||||
if (debug)
|
if (debug && Abs(pos.x - X) < 80.0f && Abs(pos.y - Y) < 80.0f)
|
||||||
CTheScripts::HighlightImportantArea(id, X - dX, Y - dY, X + dX, Y + dY, b3D ? Z : MAP_Z_LOW_LIMIT);
|
CTheScripts::HighlightImportantArea(id, X - dX, Y - dY, X + dX, Y + dY, b3D ? Z : MAP_Z_LOW_LIMIT);
|
||||||
/*
|
/*
|
||||||
if (CTheScripts::DbgFlag) {
|
if (CTheScripts::DbgFlag) {
|
||||||
|
|
Loading…
Reference in a new issue