Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/features/exhaust.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ void ExhaustFx::RenderSmokeFx(CVehicle *pVeh, const ExhaustData &info)

FxPrtMult_c fxPrt(info.Color.r / 255.0f, info.Color.g / 255.0f, info.Color.b / 255.0f, alpha, 0.2f * info.fSizeMul, 1.0f, life);

for (int i = 0; i < 2; i++)
for (int i = 0; i < 1; i++)
{
FxSystem_c *fxSystem = isExhaustSubmerged ? g_fx.m_pPrtBubble : g_fx.m_pPrtSmokeII3expand;

Expand Down
6 changes: 3 additions & 3 deletions src/features/exhausts.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ struct ExhaustData
{
std::string sName;
RwFrame *pFrame = nullptr;
CRGBA Color = {150, 150, 150, 200}; // Dark grey default
float fLifeTime = 0.4f; // Default smoke lifetime (shortened to prevent excessive rising)
CRGBA Color = {190, 190, 190, 75}; // Soft light grey vanilla-friendly smoke
float fLifeTime = 0.25f; // Vanilla-friendly smoke lifetime
float fSpeedMul = 1.0f; // Speed multiplier
float fSizeMul = 1.0f;
float fSizeMul = 0.85f; // Vanilla-friendly size multiplier
bool bNitroEffect = true;
FxSystem_c *pFxSysem = nullptr;
};
Expand Down
4 changes: 2 additions & 2 deletions src/features/gauge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ void FixedGauge::Init()
if (nodeName.starts_with("x_gauge_fixed") || nodeName == "x_gasmeter" || nodeName == "x_gm" || nodeName == "petrolok") {
auto &jsonData = DataMgr::Get(pVeh->m_nModelIndex);

float minAngle = 20.0f;
float maxAngle = 70.0f;
float minAngle = 30.0f;
float maxAngle = 120.0f;
std::string name(nodeName);
if (jsonData.contains("gauges") && jsonData["gauges"].contains(name)) {
minAngle = jsonData["gauges"][name].value("minangle", minAngle);
Expand Down
6 changes: 3 additions & 3 deletions src/features/gauge.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class MileageIndicator : public CVehFeature<VehMileageData>

struct RPMGaugeData {
RwFrame *pFrame = nullptr;
int iMaxRPM = 5000;
int iMaxRPM = 8000;
int iPrevGear = -1;
float fCurRotation = 0.0f;
float fMaxRotation = 260.0f;
Expand All @@ -83,10 +83,10 @@ class RPMGauge : public CVehFeature<VehRPMData>

struct SpeedGaugeData {
RwFrame *pFrame = nullptr;
int iMaxSpeed = 100;
int iMaxSpeed = 240;
float fMul = 160.9f;
float fCurRotation = 0.0f;
float fMaxRotation = 100.0f;
float fMaxRotation = 260.0f;
};

struct VehSpeedData
Expand Down
4 changes: 2 additions & 2 deletions src/features/roof.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

struct RoofConfig {
RwFrame* pFrame = nullptr;
float speed = 1.0f;
float speed = 1.5f;
float currentRot = 0.0f;
float prevRot = 0.0f;
float targetRot = 30.0f;
float targetRot = 60.0f;
};

enum class AnimPhase {
Expand Down