Reorder initialization order of some classes to shut up
gcc warnings about having them in a different order where defined.
This commit is contained in:
parent
ba023fa075
commit
76d9a939ed
|
@ -490,13 +490,13 @@ extern struct TCommonSettings {
|
||||||
, EnsataEmulation(false)
|
, EnsataEmulation(false)
|
||||||
, cheatsDisable(false)
|
, cheatsDisable(false)
|
||||||
, num_cores(1)
|
, num_cores(1)
|
||||||
|
, rigorous_timing(false)
|
||||||
|
, advanced_timing(true)
|
||||||
, micMode(InternalNoise)
|
, micMode(InternalNoise)
|
||||||
, spuInterpolationMode(SPUInterpolation_Linear)
|
, spuInterpolationMode(SPUInterpolation_Linear)
|
||||||
, manualBackupType(0)
|
, manualBackupType(0)
|
||||||
, spu_advanced(false)
|
|
||||||
, rigorous_timing(false)
|
|
||||||
, advanced_timing(true)
|
|
||||||
, spu_captureMuted(false)
|
, spu_captureMuted(false)
|
||||||
|
, spu_advanced(false)
|
||||||
{
|
{
|
||||||
strcpy(ARM9BIOS, "biosnds9.bin");
|
strcpy(ARM9BIOS, "biosnds9.bin");
|
||||||
strcpy(ARM7BIOS, "biosnds7.bin");
|
strcpy(ARM7BIOS, "biosnds7.bin");
|
||||||
|
@ -595,4 +595,3 @@ void ClearAutoHold(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,8 +37,6 @@ CommandLine::CommandLine()
|
||||||
: is_cflash_configured(false)
|
: is_cflash_configured(false)
|
||||||
, error(NULL)
|
, error(NULL)
|
||||||
, ctx(g_option_context_new (""))
|
, ctx(g_option_context_new (""))
|
||||||
, _rigorous_timing(0)
|
|
||||||
, _advanced_timing(-1)
|
|
||||||
, _play_movie_file(0)
|
, _play_movie_file(0)
|
||||||
, _record_movie_file(0)
|
, _record_movie_file(0)
|
||||||
, _cflash_image(0)
|
, _cflash_image(0)
|
||||||
|
@ -49,6 +47,8 @@ CommandLine::CommandLine()
|
||||||
, _bios_swi(0)
|
, _bios_swi(0)
|
||||||
, _spu_advanced(0)
|
, _spu_advanced(0)
|
||||||
, _num_cores(-1)
|
, _num_cores(-1)
|
||||||
|
, _rigorous_timing(0)
|
||||||
|
, _advanced_timing(-1)
|
||||||
{
|
{
|
||||||
load_slot = 0;
|
load_slot = 0;
|
||||||
arm9_gdb_port = arm7_gdb_port = 0;
|
arm9_gdb_port = arm7_gdb_port = 0;
|
||||||
|
|
|
@ -305,14 +305,14 @@ struct GFX3D_State
|
||||||
, enableFogAlphaOnly(false)
|
, enableFogAlphaOnly(false)
|
||||||
, shading(TOON)
|
, shading(TOON)
|
||||||
, alphaTestRef(0)
|
, alphaTestRef(0)
|
||||||
|
, activeFlushCommand(0)
|
||||||
|
, pendingFlushCommand(0)
|
||||||
, clearDepth(1)
|
, clearDepth(1)
|
||||||
, clearColor(0)
|
, clearColor(0)
|
||||||
, fogColor(0)
|
, fogColor(0)
|
||||||
, fogOffset(0)
|
, fogOffset(0)
|
||||||
, fogShift(0)
|
, fogShift(0)
|
||||||
, invalidateToon(true)
|
, invalidateToon(true)
|
||||||
, activeFlushCommand(0)
|
|
||||||
, pendingFlushCommand(0)
|
|
||||||
{
|
{
|
||||||
for(u32 i=0;i<ARRAY_SIZE(shininessTable);i++)
|
for(u32 i=0;i<ARRAY_SIZE(shininessTable);i++)
|
||||||
shininessTable[i] = 0;
|
shininessTable[i] = 0;
|
||||||
|
|
Loading…
Reference in New Issue