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

stop printing garbage to osd due to bad stdarg forwarding (bug from osd refactoring)

This commit is contained in:
zeromus 2017-02-11 08:14:27 -06:00
parent 72fa455ca0
commit 6cd42cbfe4
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/driver.cpp
View File

@ -57,7 +57,10 @@ void BaseDriver::USR_InfoMessage(const char *message)
void BaseDriver::AddLine(const char *fmt, ...) void BaseDriver::AddLine(const char *fmt, ...)
{ {
#if HAVE_LIBAGG #if HAVE_LIBAGG
osd->addLine(fmt); va_list list;
va_start(list,fmt);
osd->addLine(fmt,list);
va_end(list);
#endif #endif
} }
void BaseDriver::SetLineColor(u8 r, u8 b, u8 g) void BaseDriver::SetLineColor(u8 r, u8 b, u8 g)

33
desmume/src/frontend/modules/osd/agg/agg_osd.cpp
View File

@ -721,9 +721,9 @@ void OSDCLASS::setLineColor(u8 r=255, u8 g=255, u8 b=255)
lineText_color = AggColor(r,g,b); lineText_color = AggColor(r,g,b);
} }
void OSDCLASS::addLine(const char *fmt, ...) void OSDCLASS::addLine(const char *fmt)
{ {
va_list list; //yucky copied code from the va_list addline
if (lastLineText > OSD_MAX_LINES) lastLineText = OSD_MAX_LINES; if (lastLineText > OSD_MAX_LINES) lastLineText = OSD_MAX_LINES;
if (lastLineText == OSD_MAX_LINES) // full if (lastLineText == OSD_MAX_LINES) // full
@ -737,13 +737,34 @@ void OSDCLASS::addLine(const char *fmt, ...)
} }
} }
va_start(list,fmt); strncpy(lineText[lastLineText],fmt,1023);
lineColor[lastLineText] = lineText_color;
lineTimer[lastLineText] = time(NULL);
needUpdate = true;
lastLineText++;
}
void OSDCLASS::addLine(const char *fmt, va_list args)
{
if (lastLineText > OSD_MAX_LINES) lastLineText = OSD_MAX_LINES;
if (lastLineText == OSD_MAX_LINES) // full
{
lastLineText--;
for (int j=0; j < lastLineText; j++)
{
strcpy(lineText[j], lineText[j+1]);
lineTimer[j] = lineTimer[j+1];
lineColor[j] = lineColor[j+1];
}
}
#if defined(_MSC_VER) || defined(__INTEL_COMPILER) #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
_vsnprintf(lineText[lastLineText],1023,fmt,list); _vsnprintf(lineText[lastLineText],1023,fmt,args);
#else #else
vsnprintf(lineText[lastLineText],1023,fmt,list); vsnprintf(lineText[lastLineText],1023,fmt,args);
#endif #endif
va_end(list);
lineColor[lastLineText] = lineText_color; lineColor[lastLineText] = lineText_color;
lineTimer[lastLineText] = time(NULL); lineTimer[lastLineText] = time(NULL);
needUpdate = true; needUpdate = true;

5
desmume/src/frontend/modules/osd/agg/agg_osd.h
View File

@ -19,6 +19,8 @@
#ifndef __GPU_OSD_ #ifndef __GPU_OSD_
#define __GPU_OSD_ #define __GPU_OSD_
#include <stdarg.h>
#include "types.h" #include "types.h"
#ifdef HAVE_LIBAGG #ifdef HAVE_LIBAGG
@ -119,7 +121,8 @@ public:
void clear(); void clear();
void setListCoord(u16 x, u16 y); void setListCoord(u16 x, u16 y);
void setLineColor(u8 r, u8 b, u8 g); void setLineColor(u8 r, u8 b, u8 g);
void addLine(const char *fmt, ...); void addLine(const char* fmt);
void addLine(const char* fmt, va_list args);
void addFixed(u16 x, u16 y, const char *fmt, ...); void addFixed(u16 x, u16 y, const char *fmt, ...);
void border(bool enabled); void border(bool enabled);
}; };