Skip to content

0003994: Radio name do not always show #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2017
Merged

0003994: Radio name do not always show #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89bdf10
Merge remote-tracking branch 'refs/remotes/multitheftauto/master'
ZReC Mar 26, 2017
cc48fb6
Merge remote-tracking branch 'refs/remotes/multitheftauto/master'
ZReC Apr 20, 2017
13dd006
Fix 3994: Radio name do not always show.
ZReC May 6, 2017
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
3 changes: 2 additions & 1 deletion Client/game_sa/CVehicleSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,8 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
void SetAdjustablePropertyValue ( unsigned short usAdjustableProperty ) { *reinterpret_cast < unsigned short* > ( reinterpret_cast < unsigned int > ( m_pInterface ) + 2156 ) = usAdjustableProperty; };
void SetHeliRotorSpeed ( float fSpeed ) { *reinterpret_cast < float* > ( reinterpret_cast < unsigned int > ( m_pInterface ) + 2124 ) = fSpeed; };
void SetExplodeTime ( unsigned long ulTime ) { *reinterpret_cast < unsigned long* > ( reinterpret_cast < unsigned int > ( m_pInterface ) + 1240 ) = ulTime; };

void SetRadioStatus ( bool bStatus ) { *reinterpret_cast < unsigned char* > ( reinterpret_cast < unsigned int > (m_pInterface ) + 0x1D3 ) = bStatus; };

void SetNitroCount ( char cNitroCount ) { GetVehicleInterface ()->m_nNitroBoosts = cNitroCount; }
void SetNitroLevel ( float fLevel );

Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CClientVehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2739,6 +2739,7 @@ void CClientVehicle::Create ( void )
m_pVehicle->SetSmokeTrailEnabled ( m_bSmokeTrail );
m_pVehicle->SetGravity ( &m_vecGravity );
m_pVehicle->SetHeadLightColor ( m_HeadLightColor );
m_pVehicle->SetRadioStatus ( 0 );

if ( IsNitroInstalled() )
{
Expand Down
1 change: 1 addition & 0 deletions Client/sdk/game/CVehicle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ class CVehicle : public virtual CPhysical
virtual void SetHeliRotorSpeed ( float fSpeed ) = 0;
virtual void SetTaxiLightOn ( bool bLightState ) = 0;
virtual void SetExplodeTime ( unsigned long ulTime ) = 0;
virtual void SetRadioStatus ( bool bStatus ) = 0;

virtual void SetNitroCount ( char cNitroCount ) = 0;
virtual void SetNitroLevel ( float fNitroLevel ) = 0;
Expand Down