@ -546,7 +546,7 @@ static const Units units[] = {
*/
uint ConvertSpeedToDisplaySpeed ( uint speed )
{
return ( speed * units [ _settings_ client. gui . units ] . s_m ) > > units [ _settings_ client. gui . units ] . s_s ;
return ( speed * units [ _settings_ game. locale . units ] . s_m ) > > units [ _settings_ game. locale . units ] . s_s ;
}
/**
@ -556,7 +556,7 @@ uint ConvertSpeedToDisplaySpeed(uint speed)
*/
uint ConvertDisplaySpeedToSpeed ( uint speed )
{
return ( ( speed < < units [ _settings_ client. gui . units ] . s_s ) + units [ _settings_ client. gui . units ] . s_m / 2 ) / units [ _settings_ client. gui . units ] . s_m ;
return ( ( speed < < units [ _settings_ game. locale . units ] . s_s ) + units [ _settings_ game. locale . units ] . s_m / 2 ) / units [ _settings_ game. locale . units ] . s_m ;
}
static char * FormatString ( char * buff , const char * str , const int64 * argv , uint casei , const char * last )
@ -602,9 +602,9 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
case SCC_VELOCITY : { // {VELOCITY}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = ConvertSpeedToDisplaySpeed ( GetInt32 ( & argv ) ) ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . velocity ) , args , modifier > > 24 , last ) ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . velocity ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
@ -625,18 +625,18 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
switch ( cargo_str ) {
case STR_TONS : {
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . w_m > > units [ _settings_ client. gui . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . l_weight ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . w_m > > units [ _settings_ game. locale . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . l_weight ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
case STR_LITERS : {
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . v_m > > units [ _settings_ client. gui . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . l_volume ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . v_m > > units [ _settings_ game. locale . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . l_volume ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
@ -718,9 +718,9 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
case SCC_VOLUME : { // {VOLUME}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . v_m > > units [ _settings_ client. gui . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . l_volume ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . v_m > > units [ _settings_ game. locale . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . l_volume ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
@ -763,45 +763,45 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
case SCC_POWER : { // {POWER}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . p_m > > units [ _settings_ client. gui . units ] . p_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . power ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . p_m > > units [ _settings_ game. locale . units ] . p_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . power ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
case SCC_VOLUME_SHORT : { // {VOLUME_S}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . v_m > > units [ _settings_ client. gui . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . s_volume ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . v_m > > units [ _settings_ game. locale . units ] . v_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . s_volume ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
case SCC_WEIGHT : { // {WEIGHT}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . w_m > > units [ _settings_ client. gui . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . l_weight ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . w_m > > units [ _settings_ game. locale . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . l_weight ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
case SCC_WEIGHT_SHORT : { // {WEIGHT_S}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . w_m > > units [ _settings_ client. gui . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . s_weight ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . w_m > > units [ _settings_ game. locale . units ] . w_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . s_weight ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}
case SCC_FORCE : { // {FORCE}
int64 args [ 1 ] ;
assert ( _settings_ client. gui . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ client. gui . units ] . f_m > > units [ _settings_ client. gui . units ] . f_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ client. gui . units ] . force ) , args , modifier > > 24 , last ) ;
assert ( _settings_ game. locale . units < lengthof ( units ) ) ;
args [ 0 ] = GetInt32 ( & argv ) * units [ _settings_ game. locale . units ] . f_m > > units [ _settings_ game. locale . units ] . f_s ;
buff = FormatString ( buff , GetStringPtr ( units [ _settings_ game. locale . units ] . force ) , args , modifier > > 24 , last ) ;
modifier = 0 ;
break ;
}