Reorder class variable initialization in order to shut up gcc warnings.
This commit is contained in:
parent
67a9a34dfa
commit
cf77d4398b
|
@ -171,19 +171,20 @@ public:
|
||||||
void tryTrigger(EDMAMode mode);
|
void tryTrigger(EDMAMode mode);
|
||||||
|
|
||||||
DmaController() :
|
DmaController() :
|
||||||
enable(0), irq(0), bitWidth(EDMABitWidth_16), repeatMode(0), _startmode(0),
|
enable(0), irq(0), repeatMode(0), _startmode(0),
|
||||||
|
wordcount(0), startmode(EDMAMode_Immediate),
|
||||||
|
bitWidth(EDMABitWidth_16),
|
||||||
|
sar(EDMASourceUpdate_Increment), dar(EDMADestinationUpdate_Increment),
|
||||||
//if saddr isnt cleared then rings of fate will trigger copy protection
|
//if saddr isnt cleared then rings of fate will trigger copy protection
|
||||||
//by inspecting dma3 saddr when it boots
|
//by inspecting dma3 saddr when it boots
|
||||||
saddr(0), daddr(0),
|
saddr(0), daddr(0),
|
||||||
sar(EDMASourceUpdate_Increment), dar(EDMADestinationUpdate_Increment),
|
|
||||||
wordcount(0), startmode(EDMAMode_Immediate),
|
|
||||||
sad(&saddr),
|
|
||||||
dad(&daddr),
|
|
||||||
check(FALSE),
|
check(FALSE),
|
||||||
running(FALSE),
|
running(FALSE),
|
||||||
paused(FALSE),
|
paused(FALSE),
|
||||||
triggered(FALSE),
|
triggered(FALSE),
|
||||||
nextEvent(0)
|
nextEvent(0),
|
||||||
|
sad(&saddr),
|
||||||
|
dad(&daddr)
|
||||||
{
|
{
|
||||||
sad.controller = this;
|
sad.controller = this;
|
||||||
dad.controller = this;
|
dad.controller = this;
|
||||||
|
|
|
@ -421,19 +421,19 @@ int NDS_WriteBMP_32bppBuffer(int width, int height, const void* buf, const char
|
||||||
|
|
||||||
extern struct TCommonSettings {
|
extern struct TCommonSettings {
|
||||||
TCommonSettings()
|
TCommonSettings()
|
||||||
: UseExtBIOS(false)
|
: GFX3D_HighResolutionInterpolateColor(true)
|
||||||
|
, GFX3D_EdgeMark(true)
|
||||||
|
, GFX3D_Fog(true)
|
||||||
|
, UseExtBIOS(false)
|
||||||
, SWIFromBIOS(false)
|
, SWIFromBIOS(false)
|
||||||
, UseExtFirmware(false)
|
, UseExtFirmware(false)
|
||||||
, BootFromFirmware(false)
|
, BootFromFirmware(false)
|
||||||
, DebugConsole(false)
|
, DebugConsole(false)
|
||||||
, num_cores(1)
|
|
||||||
, spuInterpolationMode(SPUInterpolation_Linear)
|
|
||||||
//, gfx3d_flushMode(0)
|
//, gfx3d_flushMode(0)
|
||||||
, manualBackupType(0)
|
, num_cores(1)
|
||||||
, micMode(InternalNoise)
|
, micMode(InternalNoise)
|
||||||
, GFX3D_HighResolutionInterpolateColor(true)
|
, spuInterpolationMode(SPUInterpolation_Linear)
|
||||||
, GFX3D_EdgeMark(true)
|
, manualBackupType(0)
|
||||||
, GFX3D_Fog(true)
|
|
||||||
{
|
{
|
||||||
strcpy(ARM9BIOS, "biosnds9.bin");
|
strcpy(ARM9BIOS, "biosnds9.bin");
|
||||||
strcpy(ARM7BIOS, "biosnds7.bin");
|
strcpy(ARM7BIOS, "biosnds7.bin");
|
||||||
|
|
Loading…
Reference in New Issue