1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 01:20:01 +00:00

Merge branch 'master' into miami

# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
This commit is contained in:
Sergeanur 2020-05-10 01:26:12 +03:00
commit 35c41208f5
15 changed files with 31 additions and 11 deletions

View file

@ -145,7 +145,7 @@ AnimAssocDesc aStdAnimDescs[] = {
{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL }, { ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL }, { ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
{ ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT }, { ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT },
{ ANIM_CAR_GETOUT_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_GETOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL }, { ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL },

View file

@ -1904,7 +1904,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX, pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX,
0.0f); 0.0f);
CVector positionOnNextLinkIncludingLane( CVector positionOnNextLinkIncludingLane(
pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH), pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardY,
pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX, pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
0.0f); 0.0f);
#endif #endif

View file

@ -248,8 +248,9 @@ CAnimViewer::Update(void)
} }
CPad::UpdatePads(); CPad::UpdatePads();
CPad* pad = CPad::GetPad(0); CPad* pad = CPad::GetPad(0);
#ifdef DEBUGMENU
DebugMenuProcess(); DebugMenuProcess();
#endif
CStreaming::UpdateForAnimViewer(); CStreaming::UpdateForAnimViewer();
CStreaming::RequestModel(modelId, 0); CStreaming::RequestModel(modelId, 0);

View file

@ -29,7 +29,7 @@ bool PrintDebugCode = false;
int16 DebugCamMode; int16 DebugCamMode;
#ifdef FREE_CAM #ifdef FREE_CAM
bool CCamera::bFreeCam = false; bool CCamera::bFreeCam = true;
int nPreviousMode = -1; int nPreviousMode = -1;
#endif #endif

View file

@ -604,8 +604,9 @@ void CGame::Process(void)
TheCamera.SetMotionBlurAlpha(0); TheCamera.SetMotionBlurAlpha(0);
if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL) if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL)
TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE); TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
#ifdef DEBUGMENU
DebugMenuProcess(); DebugMenuProcess();
#endif
CCutsceneMgr::Update(); CCutsceneMgr::Update();
if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused()) if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
FrontEndMenuManager.Process(); FrontEndMenuManager.Process();

View file

@ -186,6 +186,7 @@ enum Config {
# define NO_MOVIES // disable intro videos # define NO_MOVIES // disable intro videos
# define NO_CDCHECK # define NO_CDCHECK
# define CHATTYSPLASH // print what the game is loading # define CHATTYSPLASH // print what the game is loading
# define DEBUGMENU
//# define TIMEBARS // print debug timers //# define TIMEBARS // print debug timers
#endif #endif

View file

@ -91,7 +91,9 @@ void GameInit(void);
void SystemInit(void); void SystemInit(void);
void TheGame(void); void TheGame(void);
#ifdef DEBUGMENU
void DebugMenuPopulate(void); void DebugMenuPopulate(void);
#endif
void void
@ -328,11 +330,10 @@ Initialise3D(void *param)
{ {
if (RsRwInitialise(param)) if (RsRwInitialise(param))
{ {
// #ifdef DEBUGMENU
DebugMenuInit(); DebugMenuInit();
DebugMenuPopulate(); DebugMenuPopulate();
// #endif // !DEBUGMENU
return CGame::InitialiseRenderWare(); return CGame::InitialiseRenderWare();
} }
@ -343,8 +344,9 @@ static void
Terminate3D(void) Terminate3D(void)
{ {
CGame::ShutdownRenderWare(); CGame::ShutdownRenderWare();
#ifdef DEBUGMENU
DebugMenuShutdown(); DebugMenuShutdown();
#endif // !DEBUGMENU
RsRwTerminate(); RsRwTerminate();
@ -878,7 +880,9 @@ Render2dStuff(void)
CPad::PrintErrorMessage(); CPad::PrintErrorMessage();
CFont::DrawFonts(); CFont::DrawFonts();
#ifdef DEBUGMENU
DebugMenuRender(); DebugMenuRender();
#endif
} }
void void

View file

@ -61,6 +61,7 @@ mysrand(unsigned int seed)
myrand_seed = seed; myrand_seed = seed;
} }
#ifdef DEBUGMENU
void WeaponCheat(); void WeaponCheat();
void HealthCheat(); void HealthCheat();
void TankCheat(); void TankCheat();
@ -386,6 +387,7 @@ DebugMenuPopulate(void)
CTweakVars::AddDBG("Debug"); CTweakVars::AddDBG("Debug");
} }
} }
#endif
const int re3_buffsize = 1024; const int re3_buffsize = 1024;
static char re3_buff[re3_buffsize]; static char re3_buff[re3_buffsize];

View file

@ -1,4 +1,5 @@
#include "common.h" #include "common.h"
#ifdef DEBUGMENU
#include "RwHelper.h" #include "RwHelper.h"
#include "Pad.h" #include "Pad.h"
#include "ControllerConfig.h" #include "ControllerConfig.h"
@ -1313,3 +1314,4 @@ DebugMenuEntrySetAddress(MenuEntry *e, void *addr)
((MenuEntry_Float32*)e)->variable = (float*)addr; ((MenuEntry_Float32*)e)->variable = (float*)addr;
} }
} }
#endif

View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#ifdef DEBUGMENU
typedef void (*TriggerFunc)(void); typedef void (*TriggerFunc)(void);
struct Menu; struct Menu;
@ -85,3 +87,4 @@ inline DebugMenuEntry *DebugMenuAddVarBool8(const char *path, const char *name,
{ {
return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc); return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc);
} }
#endif

View file

@ -3856,7 +3856,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
if (IsPedHeadAbovePos(-0.3f)) { if (IsPedHeadAbovePos(-0.3f)) {
dieAnim = NUM_ANIMS; dieAnim = NUM_ANIMS;
} else { } else {
if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FLAG800)) if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
dieAnim = ANIM_FLOOR_HIT_F; dieAnim = ANIM_FLOOR_HIT_F;
else else
dieAnim = ANIM_FLOOR_HIT; dieAnim = ANIM_FLOOR_HIT;

View file

@ -222,10 +222,12 @@ int32 Randomizer;
int32 nParticleCreationInterval = 1; int32 nParticleCreationInterval = 1;
float fParticleScaleLimit = 0.5f; float fParticleScaleLimit = 0.5f;
#ifdef DEBUGMENU
SETTWEAKPATH("Particle"); SETTWEAKPATH("Particle");
TWEAKINT32(nParticleCreationInterval, 0, 5, 1); TWEAKINT32(nParticleCreationInterval, 0, 5, 1);
TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f); TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f);
TWEAKFUNC(CParticle::ReloadConfig); TWEAKFUNC(CParticle::ReloadConfig);
#endif
void CParticle::ReloadConfig() void CParticle::ReloadConfig()
{ {

View file

@ -20,8 +20,10 @@
#include "SpecialFX.h" #include "SpecialFX.h"
#include "Shadows.h" #include "Shadows.h"
#ifdef DEBUGMENU
SETTWEAKPATH("Shadows"); SETTWEAKPATH("Shadows");
TWEAKBOOL(gbPrintShite); TWEAKBOOL(gbPrintShite);
#endif
RwImVertexIndex ShadowIndexList[24]; RwImVertexIndex ShadowIndexList[24];

View file

@ -13,6 +13,7 @@ RtCharset *debugCharset;
bool gPS2alphaTest = 1; bool gPS2alphaTest = 1;
#ifndef FINAL
static bool charsetOpen; static bool charsetOpen;
void OpenCharsetSafe() void OpenCharsetSafe()
{ {
@ -20,6 +21,7 @@ void OpenCharsetSafe()
RtCharsetOpen(); RtCharsetOpen();
charsetOpen = true; charsetOpen = true;
} }
#endif
void CreateDebugFont() void CreateDebugFont()
{ {