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

fix message display during NSF rendering

This commit is contained in:
zeromus 2015-10-12 22:40:14 +00:00
parent 8034f545ad
commit 95890b21ea
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trunk/src/nsf.cpp
View File

@ -568,13 +568,14 @@ void DrawNSF(uint8 *XBuf)
} }
} }
DrawTextTrans(ClipSidesOffset+XBuf+10*256+4+(((31-strlen((char*)NSFHeader.SongName))<<2)), 256, NSFHeader.SongName, 6); static const int kFgColor = 1;
DrawTextTrans(ClipSidesOffset+XBuf+26*256+4+(((31-strlen((char*)NSFHeader.Artist))<<2)), 256,NSFHeader.Artist, 6); DrawTextTrans(ClipSidesOffset+XBuf+10*256+4+(((31-strlen((char*)NSFHeader.SongName))<<2)), 256, NSFHeader.SongName, kFgColor);
DrawTextTrans(ClipSidesOffset+XBuf+42*256+4+(((31-strlen((char*)NSFHeader.Copyright))<<2)), 256,NSFHeader.Copyright, 6); DrawTextTrans(ClipSidesOffset+XBuf+26*256+4+(((31-strlen((char*)NSFHeader.Artist))<<2)), 256,NSFHeader.Artist, kFgColor);
DrawTextTrans(ClipSidesOffset+XBuf+42*256+4+(((31-strlen((char*)NSFHeader.Copyright))<<2)), 256,NSFHeader.Copyright, kFgColor);
DrawTextTrans(ClipSidesOffset+XBuf+70*256+4+(((31-strlen("Song:"))<<2)), 256, (uint8*)"Song:", 6); DrawTextTrans(ClipSidesOffset+XBuf+70*256+4+(((31-strlen("Song:"))<<2)), 256, (uint8*)"Song:", kFgColor);
sprintf(snbuf,"<%d/%d>",CurrentSong,NSFHeader.TotalSongs); sprintf(snbuf,"<%d/%d>",CurrentSong,NSFHeader.TotalSongs);
DrawTextTrans(XBuf+82*256+4+(((31-strlen(snbuf))<<2)), 256, (uint8*)snbuf, 6); DrawTextTrans(XBuf+82*256+4+(((31-strlen(snbuf))<<2)), 256, (uint8*)snbuf, kFgColor);
{ {
static uint8 last=0; static uint8 last=0;

24
trunk/src/palette.cpp
View File

@ -498,9 +498,9 @@ void FCEU_ResetPalette(void)
static void ChoosePalette(void) static void ChoosePalette(void)
{ {
//if it's an NSF, there's NO palette? that's right, only the 'unvarying' palette will get used //NSF uses a fixed palette always:
if(GameInfo->type==GIT_NSF) if(GameInfo->type==GIT_NSF)
palo = NULL; palo = default_palette[0];
//user palette takes priority over others //user palette takes priority over others
else if(palette_user_available) else if(palette_user_available)
palo = palette_user; palo = palette_user;
@ -537,19 +537,13 @@ void WritePalette(void)
for(x=7;x<256;x++) for(x=7;x<256;x++)
FCEUD_SetPalette(x,205,205,205); FCEUD_SetPalette(x,205,205,205);
if(GameInfo->type==GIT_NSF) //sets palette entries >= 128 with the 64 selected main colors
{ for(x=0;x<64;x++)
#ifdef _S9XLUA_H FCEUD_SetPalette(128+x,palo[x].r,palo[x].g,palo[x].b);
FCEU_LuaUpdatePalette(); SetNESDeemph_OldHacky(lastd,1);
#endif #ifdef _S9XLUA_H
} FCEU_LuaUpdatePalette();
else #endif
{
//sets palette entries >= 128 with the 64 selected main colors
for(x=0;x<64;x++)
FCEUD_SetPalette(128+x,palo[x].r,palo[x].g,palo[x].b);
SetNESDeemph_OldHacky(lastd,1);
}
} }
void FCEUI_GetNTSCTH(int *tint, int *hue) void FCEUI_GetNTSCTH(int *tint, int *hue)