Commit 1b9788e8 authored by GnoStiC's avatar GnoStiC

puae 2.3.1

parent 2dd5ee19
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
*/ */
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QMessageBox>
#include <QThread> #include <QThread>
#include "puae_bridge.h" #include "puae_bridge.h"
#include "puae_mainwindow.h" #include "puae_mainwindow.h"
//#include "ui_puae_mainwindow.h" //#include "ui_puae_mainwindow.h"
static unsigned int gui_available;
extern "C" { extern "C" {
#include "gui.h" #include "gui.h"
#include "options.h" #include "options.h"
...@@ -79,6 +82,17 @@ void gui_display (int shortcut) ...@@ -79,6 +82,17 @@ void gui_display (int shortcut)
extern "C" void gui_message (const char *format,...) extern "C" void gui_message (const char *format,...)
{ {
char msg[2048];
va_list parms;
va_start (parms, format);
vsprintf (msg, format, parms);
va_end (parms);
if (gui_available)
QMessageBox::information(0, "PUAE", msg);
// write_log (msg);
} }
void gui_fps (int fps, int idle) void gui_fps (int fps, int idle)
......
This diff is collapsed.
...@@ -59,7 +59,7 @@ int p96hack_vpos, p96hack_vpos2, p96refresh_active; ...@@ -59,7 +59,7 @@ int p96hack_vpos, p96hack_vpos2, p96refresh_active;
#define NOBLITTER 0 #define NOBLITTER 0
#define NOBLITTER_BLIT 0 #define NOBLITTER_BLIT 0
#define USE_HARDWARESPRITE 1 #define USE_HARDWARESPRITE 1
#define P96TRACING_ENABLED 1 #define P96TRACING_ENABLED 0
#define P96SPRTRACING_ENABLED 0 #define P96SPRTRACING_ENABLED 0
static int hwsprite = 0; static int hwsprite = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment