Fix build in g++

This commit is contained in:
Jeffrey Pfau 2014-10-15 01:47:01 -07:00
parent ae256542cb
commit fdbb0ac753
1 changed files with 8 additions and 9 deletions

View File

@ -16,15 +16,7 @@ using namespace QGBA;
GameController::GameController(QObject* parent)
: QObject(parent)
, m_drawContext(new uint32_t[256 * 256])
, m_threadContext {
.state = THREAD_INITIALIZED,
.debugger = 0,
.frameskip = 0,
.bios = 0,
.userData = this,
.rewindBufferCapacity = 0,
.logLevel = -1,
}
, m_threadContext()
, m_activeKeys(0)
, m_rom(nullptr)
, m_audioThread(new QThread(this))
@ -34,7 +26,14 @@ GameController::GameController(QObject* parent)
GBAVideoSoftwareRendererCreate(m_renderer);
m_renderer->outputBuffer = (color_t*) m_drawContext;
m_renderer->outputBufferStride = 256;
m_threadContext.state = THREAD_INITIALIZED;
m_threadContext.debugger = 0;
m_threadContext.frameskip = 0;
m_threadContext.bios = 0;
m_threadContext.renderer = &m_renderer->d;
m_threadContext.userData = this;
m_threadContext.rewindBufferCapacity = 0;
m_threadContext.logLevel = -1;
GBAInputMapInit(&m_threadContext.inputMap);