ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Converted some NULLs to zeros to fix build on some systems. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@848 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2009-01-12 07:56:04 +00:00
parent f7b55782fd
commit ec72c82c3c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gba/Globals.cpp
View File

@ -40,15 +40,15 @@ bool skipSaveGameCheats = false;
// 0x0000 to 0x7FFF: set custom 15 bit color // 0x0000 to 0x7FFF: set custom 15 bit color
int customBackdropColor = -1; int customBackdropColor = -1;
u8 *bios = NULL; u8 *bios = 0;
u8 *rom = NULL; u8 *rom = 0;
u8 *internalRAM = NULL; u8 *internalRAM = 0;
u8 *workRAM = NULL; u8 *workRAM = 0;
u8 *paletteRAM = NULL; u8 *paletteRAM = 0;
u8 *vram = NULL; u8 *vram = 0;
u8 *pix = NULL; u8 *pix = 0;
u8 *oam = NULL; u8 *oam = 0;
u8 *ioMem = NULL; u8 *ioMem = 0;
u16 DISPCNT = 0x0080; u16 DISPCNT = 0x0080;
u16 DISPSTAT = 0x0000; u16 DISPSTAT = 0x0000;

4
src/gtk/filters.cpp
View File

@ -56,7 +56,7 @@ struct {
} }
static const astFilters[] = static const astFilters[] =
{ {
{ "None", 1, { NULL, NULL } }, { "None", 1, { 0, 0 } },
{ "2xSaI", 2, { _2xSaI, _2xSaI32 } }, { "2xSaI", 2, { _2xSaI, _2xSaI32 } },
{ "Super 2xSaI", 2, { Super2xSaI, Super2xSaI32 } }, { "Super 2xSaI", 2, { Super2xSaI, Super2xSaI32 } },
{ "Super Eagle", 2, { SuperEagle, SuperEagle32 } }, { "Super Eagle", 2, { SuperEagle, SuperEagle32 } },
@ -76,7 +76,7 @@ struct {
} }
static const astFiltersIB[] = static const astFiltersIB[] =
{ {
{ "None", { NULL, NULL } }, { "None", { 0, 0 } },
{ "Smart interframe blending", { SmartIB, SmartIB32 } }, { "Smart interframe blending", { SmartIB, SmartIB32 } },
{ "Interframe motion blur", { MotionBlurIB, MotionBlurIB32 } } { "Interframe motion blur", { MotionBlurIB, MotionBlurIB32 } }
}; };

2
src/sdl/filters.cpp
View File

@ -452,7 +452,7 @@ void sdlMakeStretcher(int width, int sizeOption)
#else // C_CORE #else // C_CORE
void (*sdlStretcher)(u8 *, u8*, int) = NULL; void (*sdlStretcher)(u8 *, u8*, int) = 0;
#define SDL_CALL_STRETCHER \ #define SDL_CALL_STRETCHER \
sdlStretcher(srcPtr, dstPtr, width) sdlStretcher(srcPtr, dstPtr, width)