a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 20:10:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# 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
parent e4683a3074 d9a3533438
commit 35c41208f5
15 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/animation/AnimManager.cpp
View file

@ -145,7 +145,7 @@ AnimAssocDesc aStdAnimDescs[] = {
{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
{ 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_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL },

2
src/control/CarCtrl.cpp
View file

@ -1904,7 +1904,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX,
0.0f);
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,
0.0f);
#endif

3
src/core/AnimViewer.cpp
View file

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

2
src/core/Cam.cpp
View file

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

3
src/core/Game.cpp
View file

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

1
src/core/config.h
View file

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

12
src/core/main.cpp
View file

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

2
src/core/re3.cpp
View file

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

2
src/extras/debugmenu.cpp
View file

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

3
src/extras/debugmenu.h
View file

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

2
src/peds/Ped.cpp
View file

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

2
src/render/Particle.cpp
View file

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

2
src/render/Shadows.cpp
View file

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

2
src/rw/RwHelper.cpp
View file

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