Attachment #113454 for bug #170568

View | Details | Raw Unified | Return to bug 170568
Collapse All | Expand All





struct SSettings Settings;

struct SDSP1 DSP1;

struct SSA1Registers SA1Registers;

struct SSA1 SA1;

SSoundData SoundData;

SnesModel M1SNES={1,3,2};
SnesModel M2SNES={2,4,3};
SnesModel* Model=&M1SNES;


uint8 *SRAM = NULL;
uint8 *ROM = NULL;
uint8 *RegRAM = NULL;


END_EXTERN_C

struct SDSP1 DSP1;

SnesModel M1SNES={1,3,2};
SnesModel M2SNES={2,4,3};
SnesModel* Model=&M1SNES;

#ifndef ZSNES_FX
struct FxInit_s SuperFX;
#else

Return to bug 170568

Lines 123-141 Link Here

(-)globals.cpp.old (-7 / +6 lines)
123		123
124	struct SSettings Settings;	124	struct SSettings Settings;
125		125
126	struct SDSP1 DSP1;
127
128	struct SSA1Registers SA1Registers;	126	struct SSA1Registers SA1Registers;
129		127
130	struct SSA1 SA1;	128	struct SSA1 SA1;
131		129
132	SSoundData SoundData;	130	SSoundData SoundData;
133		131
134	SnesModel M1SNES={1,3,2};
135	SnesModel M2SNES={2,4,3};
136	SnesModel* Model=&M1SNES;
137
138
139	uint8 *SRAM = NULL;	132	uint8 *SRAM = NULL;
140	uint8 *ROM = NULL;	133	uint8 *ROM = NULL;
141	uint8 *RegRAM = NULL;	134	uint8 *RegRAM = NULL;
Lines 162-167 Link Here
162		155
163	END_EXTERN_C	156	END_EXTERN_C
164		157
		158	struct SDSP1 DSP1;
		159
		160	SnesModel M1SNES={1,3,2};
		161	SnesModel M2SNES={2,4,3};
		162	SnesModel* Model=&M1SNES;
		163
165	#ifndef ZSNES_FX	164	#ifndef ZSNES_FX
166	struct FxInit_s SuperFX;	165	struct FxInit_s SuperFX;
167	#else	166	#else