mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-25 18:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Fluff done, FireInstantHit fix

Browse source
This commit is contained in:
majestic 2020-10-20 16:04:51 -07:00
parent 1fef3e106c b36759b586
commit 6a89fe401a
5 changed files with 45 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/Game.h
View file

@ -4,7 +4,9 @@ enum eLevelName {
LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel
LEVEL_GENERIC = 0, LEVEL_GENERIC = 0,
LEVEL_BEACH, LEVEL_BEACH,
LEVEL_MAINLAND LEVEL_MAINLAND,
NUM_LEVELS
}; };
enum eAreaName { enum eAreaName {

69
src/render/Fluff.cpp
View file

@ -410,7 +410,7 @@ void CMovingThings::Init()
} }
} }
for (int32 i = 0; i < 3; i++) { for (int32 i = 0; i < NUM_LEVELS; i++) {
for (CPtrNode *pNode = CWorld::GetBigBuildingList((eLevelName)i).first; pNode; pNode = pNode->next) { for (CPtrNode *pNode = CWorld::GetBigBuildingList((eLevelName)i).first; pNode; pNode = pNode->next) {
CEntity *pEntity = (CEntity *)pNode->item; CEntity *pEntity = (CEntity *)pNode->item;
PossiblyAddThisEntity(pEntity); PossiblyAddThisEntity(pEntity);
@ -418,7 +418,7 @@ void CMovingThings::Init()
} }
CEscalators::Init(); CEscalators::Init();
aScrollBars[0].Init(CVector(-1069.209f, 1320.126f, 18.848f), CVector(-1069.209f, 1342.299f, 22.612), 0, 128, 255, 0, 0.3f); aScrollBars[0].Init(CVector(-1069.209f, 1320.126f, 18.848f), CVector(-1069.209f, 1342.299f, 22.612), SCROLL_ARENA_STRING, 128, 255, 0, 0.3f);
} }
void CMovingThings::Shutdown() void CMovingThings::Shutdown()
@ -480,7 +480,7 @@ void CMovingThing::Update()
{ {
switch (m_nType) { switch (m_nType) {
case 1: { case 1: {
float angle = (CTimer::GetTimeInMilliseconds() % 0x3FFF) * 0.0003835f; float angle = (CTimer::GetTimeInMilliseconds() % 0x3FFF) * TWOPI / 0x3FFF;
m_pEntity->GetRight() = CVector(-Sin(angle), Cos(angle), 0.0f); m_pEntity->GetRight() = CVector(-Sin(angle), Cos(angle), 0.0f);
m_pEntity->GetForward() = CVector(0.0f, 0.0f, 1.0f); m_pEntity->GetForward() = CVector(0.0f, 0.0f, 1.0f);
m_pEntity->GetUp() = CVector(Cos(angle), Sin(angle), 0.0f); m_pEntity->GetUp() = CVector(Cos(angle), Sin(angle), 0.0f);
@ -489,33 +489,32 @@ void CMovingThing::Update()
if (Abs(TheCamera.GetPosition().x - m_pEntity->GetPosition().x) < 600.0f && if (Abs(TheCamera.GetPosition().x - m_pEntity->GetPosition().x) < 600.0f &&
Abs(TheCamera.GetPosition().y - m_pEntity->GetPosition().y) < 600.0f) { Abs(TheCamera.GetPosition().y - m_pEntity->GetPosition().y) < 600.0f) {
CVector delta = m_pEntity->GetPosition() - TheCamera.GetPosition(); CVector delta = m_pEntity->GetPosition() - TheCamera.GetPosition();
float ratio = 1.0f / delta.Magnitude(); delta.Normalise();
CVector scaledDelta = delta * ratio;
if (scaledDelta.x * Cos(angle) + scaledDelta.y * Sin(angle) < -0.92f) { if (delta.x * Cos(angle) + delta.y * Sin(angle) < -0.92f) {
CVector coors = m_pEntity->GetPosition() - 10.0f * scaledDelta; CVector coors = m_pEntity->GetPosition() - 10.0f * delta;
CCoronas::RegisterCorona((uintptr)&m_pEntity + 1, 128, 128, 100, 255, coors, 70.0f, 600.0f, 0.0f, CCoronas::TYPE_STAR, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f, false, 1.5f); CCoronas::RegisterCorona(43, 128, 128, 100, 255, coors, 70.0f, 600.0f, 0.0f, CCoronas::TYPE_STAR, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f, false, 1.5f);
} }
} }
} }
} }
break; break;
case 2: { case 2: {
float angle = (CTimer::GetTimeInMilliseconds() % 0x7FF) * 0.003068f; float angle = (CTimer::GetTimeInMilliseconds() % 0x7FF) * TWOPI / 0x7FF;
m_pEntity->GetRight() = CVector(Cos(angle), Sin(angle), 0.0f); m_pEntity->GetRight() = CVector(Cos(angle), Sin(angle), 0.0f);
m_pEntity->GetForward() = CVector(-Sin(angle), Cos(angle), 0.0f); m_pEntity->GetForward() = CVector(-Sin(angle), Cos(angle), 0.0f);
m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f); m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f);
} }
break; break;
case 3: { case 3: {
float angle = (CTimer::GetTimeInMilliseconds() % 0x3FF) * 0.006136f; float angle = (CTimer::GetTimeInMilliseconds() % 0x3FF) * TWOPI / 0x3FF;
m_pEntity->GetRight() = CVector(Cos(angle), Sin(angle), 0.0f); m_pEntity->GetRight() = CVector(Cos(angle), Sin(angle), 0.0f);
m_pEntity->GetForward() = CVector(-Sin(angle), Cos(angle), 0.0f); m_pEntity->GetForward() = CVector(-Sin(angle), Cos(angle), 0.0f);
m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f); m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f);
} }
break; break;
case 4: { case 4: {
float angle = (CTimer::GetTimeInMilliseconds() % 0x3FFFF) * 0.000024f; float angle = (CTimer::GetTimeInMilliseconds() % 0x3FFFF) * TWOPI / 0x3FFFF;
m_pEntity->GetRight() = CVector(-Cos(angle), -Sin(angle), 0.0f); m_pEntity->GetRight() = CVector(-Cos(angle), -Sin(angle), 0.0f);
m_pEntity->GetForward() = CVector(Sin(angle), -Cos(angle), 0.0f); m_pEntity->GetForward() = CVector(Sin(angle), -Cos(angle), 0.0f);
m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f); m_pEntity->GetUp() = CVector(0.0f, 0.0f, 1.0f);
@ -529,17 +528,18 @@ void CMovingThing::Update()
m_pEntity->GetMatrix().UpdateRW(); m_pEntity->GetMatrix().UpdateRW();
m_pEntity->UpdateRwFrame(); m_pEntity->UpdateRwFrame();
if (SQR(m_pEntity->GetPosition().x - TheCamera.GetPosition().x) + SQR(m_pEntity->GetPosition().y - TheCamera.GetPosition().y) >= lengths[m_nType]) { if (SQR(m_pEntity->GetPosition().x - TheCamera.GetPosition().x) + SQR(m_pEntity->GetPosition().y - TheCamera.GetPosition().y) >= SQR(lengths[m_nType])) {
if (m_nHidden == 1) {
AddToList(&CMovingThings::StartCloseList);
m_nHidden = 0;
}
} else {
if (m_nHidden == 0) { if (m_nHidden == 0) {
RemoveFromList(); RemoveFromList();
m_nHidden = 1; m_nHidden = 1;
} }
} }
else {
if (m_nHidden == 1) {
AddToList(&CMovingThings::StartCloseList);
m_nHidden = 0;
}
}
} }
void CMovingThing::AddToList(CMovingThing *pThing) void CMovingThing::AddToList(CMovingThing *pThing)
@ -569,7 +569,7 @@ int16 CMovingThing::SizeList()
return count; return count;
} }
void CMovingThings::RegisterOne(int16 nType, CEntity *pEnt) { void CMovingThings::RegisterOne(CEntity *pEnt, uint16 nType) {
if (Num >= NUMMOVINGTHINGS) if (Num >= NUMMOVINGTHINGS)
return; return;
@ -582,18 +582,19 @@ void CMovingThings::RegisterOne(int16 nType, CEntity *pEnt) {
} }
void CMovingThings::PossiblyAddThisEntity(CEntity *pEnt) { void CMovingThings::PossiblyAddThisEntity(CEntity *pEnt) {
if (pEnt->GetModelIndex() == MI_LIGHTBEAM) if (pEnt->GetModelIndex() == MI_LIGHTBEAM) {
RegisterOne(1, pEnt); RegisterOne(pEnt, 1);
}
if (pEnt->GetModelIndex() == MI_AIRPORTRADAR) else if (pEnt->GetModelIndex() == MI_AIRPORTRADAR) {
RegisterOne(2, pEnt); RegisterOne(pEnt, 2);
}
if (pEnt->GetModelIndex() == MI_MALLFAN || pEnt->GetModelIndex() == MI_HOTELFAN_NIGHT else if (pEnt->GetModelIndex() == MI_MALLFAN || pEnt->GetModelIndex() == MI_HOTELFAN_NIGHT
|| pEnt->GetModelIndex() == MI_HOTELFAN_DAY || pEnt->GetModelIndex() == MI_HOTROOMFAN) || pEnt->GetModelIndex() == MI_HOTELFAN_DAY || pEnt->GetModelIndex() == MI_HOTROOMFAN) {
RegisterOne(3, pEnt); RegisterOne(pEnt, 3);
}
if (pEnt->GetModelIndex() == MI_BLIMP_NIGHT || pEnt->GetModelIndex() == MI_BLIMP_DAY) else if (pEnt->GetModelIndex() == MI_BLIMP_NIGHT || pEnt->GetModelIndex() == MI_BLIMP_DAY) {
RegisterOne(4, pEnt); RegisterOne(pEnt, 4);
}
} }
char String_Time[] = "THE TIME IS 12:34 "; char String_Time[] = "THE TIME IS 12:34 ";
@ -614,7 +615,7 @@ void CScrollBar::Init(CVector pos1, CVector pos2, uint8 type, uint8 red, uint8 g
m_pMessage = ". "; m_pMessage = ". ";
m_MessageCurrentChar = 0; m_MessageCurrentChar = 0;
m_MessageLength = 2; m_MessageLength = strlen(m_pMessage);
m_Counter = 0; m_Counter = 0;
m_bVisible = false; m_bVisible = false;
@ -654,7 +655,7 @@ void CScrollBar::Update()
if (m_Type == SCROLL_ARENA_STRING) { if (m_Type == SCROLL_ARENA_STRING) {
while (previousMessage == m_pMessage) while (previousMessage == m_pMessage)
{ {
switch (CGeneral::GetRandomNumber() % 3) switch (CGeneral::GetRandomNumber() % 4)
{ {
case 0: case 0:
switch (TonightsEvent) { switch (TonightsEvent) {
@ -686,9 +687,11 @@ void CScrollBar::Update()
m_pMessage = "HYMAN MEMORIAL STADIUM. HOME TO SOME OF THE BIGGEST EVENTS OF" m_pMessage = "HYMAN MEMORIAL STADIUM. HOME TO SOME OF THE BIGGEST EVENTS OF"
" THE WESTERN HEMISPHERE. ALSO AVAILABLE FOR CHILDREN PARTIES. . . "; " THE WESTERN HEMISPHERE. ALSO AVAILABLE FOR CHILDREN PARTIES. . . ";
break; break;
default: case 3:
m_pMessage = FindTimeMessage(); m_pMessage = FindTimeMessage();
break; break;
default:
break;
} }
} }
} }

2
src/render/Fluff.h
View file

@ -150,7 +150,7 @@ public:
static void Update(); static void Update();
static void Render(); static void Render();
static void PossiblyAddThisEntity(CEntity *pEnt); static void PossiblyAddThisEntity(CEntity *pEnt);
static void RegisterOne(int16 nType, CEntity *pEnt); static void RegisterOne(CEntity *pEnt, uint16 nType);
}; };
class CScrollBar class CScrollBar

2
src/render/Font.cpp
View file

@ -468,7 +468,7 @@ bool CFont::IsAnsiCharacter(wchar *s)
void void
CFont::PrintString(float xstart, float ystart, wchar *s) CFont::PrintString(float xstart, float ystart, wchar *s)
{ {
CRect rect(1000000.0f, -1000000.0f, 1000000.0f, -1000000.0f); CRect rect;
int numSpaces; int numSpaces;
float lineLength; float lineLength;
float x, y; float x, y;

9
src/weapons/Weapon.cpp
View file

@ -933,26 +933,25 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
} }
else if ( shooter == FindPlayerPed() && TheCamera.Cams[0].Using3rdPersonMouseCam() ) else if ( shooter == FindPlayerPed() && TheCamera.Cams[0].Using3rdPersonMouseCam() )
{ {
CVector src, trgt; TheCamera.Find3rdPersonCamTargetVector(info->m_fRange, *fireSource, source, target);
TheCamera.Find3rdPersonCamTargetVector(info->m_fRange, *fireSource, src, trgt);
CWorld::bIncludeBikers = true; CWorld::bIncludeBikers = true;
CWorld::bIncludeDeadPeds = true; CWorld::bIncludeDeadPeds = true;
CWorld::bIncludeCarTyres = true; CWorld::bIncludeCarTyres = true;
CWorld::ProcessLineOfSight(src, trgt, point, victim, true, true, true, true, true, false, false, true); CWorld::ProcessLineOfSight(source, target, point, victim, true, true, true, true, true, false, false, true);
CWorld::bIncludeBikers = false; CWorld::bIncludeBikers = false;
CWorld::bIncludeDeadPeds = false; CWorld::bIncludeDeadPeds = false;
CWorld::bIncludeCarTyres = false; CWorld::bIncludeCarTyres = false;
if (victim) if (victim)
CheckForShootingVehicleOccupant(&victim, &point, m_eWeaponType, src, trgt); CheckForShootingVehicleOccupant(&victim, &point, m_eWeaponType, source, target);
int32 rotSpeed = 1; int32 rotSpeed = 1;
if ( m_eWeaponType == WEAPONTYPE_M4 ) if ( m_eWeaponType == WEAPONTYPE_M4 )
rotSpeed = 4; rotSpeed = 4;
CVector bulletPos; CVector bulletPos;
if ( CHeli::TestBulletCollision(&src, &trgt, &bulletPos, 4) ) if ( CHeli::TestBulletCollision(&source, &target, &bulletPos, 4) )
{ {
for ( int32 i = 0; i < 16; i++ ) for ( int32 i = 0; i < 16; i++ )
CParticle::AddParticle(PARTICLE_SPARK, bulletPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.0f, rotSpeed); CParticle::AddParticle(PARTICLE_SPARK, bulletPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.0f, rotSpeed);