mirror of
https://github.com/FWGS/xash3d-fwgs.git
synced 2026-08-11 06:32:10 +08:00
engine: use designated initializers where possible
This commit is contained in:
+18
-15
@@ -2659,16 +2659,17 @@ static qboolean SV_EntFire_f( sv_client_t *cl )
|
||||
{
|
||||
string keyname;
|
||||
string value;
|
||||
KeyValueData pkvd;
|
||||
if( Cmd_Argc() != 5 )
|
||||
return false;
|
||||
|
||||
pkvd.szClassName = (char*)SV_GetString( ent->v.classname );
|
||||
Q_strncpy( keyname, Cmd_Argv( 3 ), sizeof( keyname ));
|
||||
Q_strncpy( value, Cmd_Argv( 4 ), sizeof( value ));
|
||||
pkvd.szKeyName = keyname;
|
||||
pkvd.szValue = value;
|
||||
pkvd.fHandled = false;
|
||||
KeyValueData pkvd =
|
||||
{
|
||||
.szClassName = (char*)SV_GetString( ent->v.classname ),
|
||||
.szKeyName = keyname,
|
||||
.szValue = value,
|
||||
};
|
||||
svgame.dllFuncs.pfnKeyValue( ent, &pkvd );
|
||||
|
||||
if( pkvd.fHandled )
|
||||
@@ -2951,7 +2952,6 @@ static qboolean SV_EntCreate_f( sv_client_t *cl )
|
||||
{
|
||||
string keyname;
|
||||
string value;
|
||||
KeyValueData pkvd;
|
||||
|
||||
// allow split keyvalues to prespawn and postspawn
|
||||
if( !Q_strcmp( Cmd_Argv( i ), "|" ) )
|
||||
@@ -2959,10 +2959,12 @@ static qboolean SV_EntCreate_f( sv_client_t *cl )
|
||||
|
||||
Q_strncpy( keyname, Cmd_Argv( i++ ), sizeof( keyname ));
|
||||
Q_strncpy( value, Cmd_Argv( i ), sizeof( value ));
|
||||
pkvd.fHandled = false;
|
||||
pkvd.szClassName = (char*)SV_GetString( ent->v.classname );
|
||||
pkvd.szKeyName = keyname;
|
||||
pkvd.szValue = value;
|
||||
KeyValueData pkvd =
|
||||
{
|
||||
.szClassName = (char*)SV_GetString( ent->v.classname ),
|
||||
.szKeyName = keyname,
|
||||
.szValue = value,
|
||||
};
|
||||
svgame.dllFuncs.pfnKeyValue( ent, &pkvd );
|
||||
|
||||
if( pkvd.fHandled )
|
||||
@@ -3018,14 +3020,15 @@ static qboolean SV_EntCreate_f( sv_client_t *cl )
|
||||
{
|
||||
string keyname;
|
||||
string value;
|
||||
KeyValueData pkvd;
|
||||
|
||||
Q_strncpy( keyname, Cmd_Argv( i++ ), sizeof( keyname ));
|
||||
Q_strncpy( value, Cmd_Argv( i ), sizeof( value ));
|
||||
pkvd.fHandled = false;
|
||||
pkvd.szClassName = (char*)SV_GetString( ent->v.classname );
|
||||
pkvd.szKeyName = keyname;
|
||||
pkvd.szValue = value;
|
||||
KeyValueData pkvd =
|
||||
{
|
||||
.szClassName = (char*)SV_GetString( ent->v.classname ),
|
||||
.szKeyName = keyname,
|
||||
.szValue = value,
|
||||
};
|
||||
svgame.dllFuncs.pfnKeyValue( ent, &pkvd );
|
||||
|
||||
if( pkvd.fHandled )
|
||||
|
||||
+10
-9
@@ -3804,7 +3804,6 @@ pfnRunPlayerMove
|
||||
static void GAME_EXPORT pfnRunPlayerMove( edict_t *pClient, const float *viewangles, float fmove, float smove, float upmove, word buttons, byte impulse, byte msec )
|
||||
{
|
||||
sv_client_t *cl, *oldcl;
|
||||
usercmd_t cmd;
|
||||
uint seed;
|
||||
|
||||
if(( cl = SV_ClientFromEdict( pClient, true )) == NULL )
|
||||
@@ -3818,14 +3817,16 @@ static void GAME_EXPORT pfnRunPlayerMove( edict_t *pClient, const float *viewang
|
||||
sv.current_client = SV_ClientFromEdict( pClient, true );
|
||||
sv.current_client->timebase = (sv.time + sv.frametime) - ((double)msec / 1000.0);
|
||||
|
||||
memset( &cmd, 0, sizeof( cmd ));
|
||||
VectorCopy( viewangles, cmd.viewangles );
|
||||
cmd.forwardmove = fmove;
|
||||
cmd.sidemove = smove;
|
||||
cmd.upmove = upmove;
|
||||
cmd.buttons = buttons;
|
||||
cmd.impulse = impulse;
|
||||
cmd.msec = msec;
|
||||
usercmd_t cmd =
|
||||
{
|
||||
.viewangles = Vec3( viewangles ),
|
||||
.forwardmove = fmove,
|
||||
.sidemove = smove,
|
||||
.upmove = upmove,
|
||||
.buttons = buttons,
|
||||
.impulse = impulse,
|
||||
.msec = msec,
|
||||
};
|
||||
|
||||
seed = COM_RandomLong( 0, 0x7fffffff ); // full range
|
||||
|
||||
|
||||
Reference in New Issue
Block a user