From 4ad544a2887b4fa558c9e15bc3d23988bada7480 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Thu, 21 Jul 2011 00:33:57 +0000 Subject: [PATCH] Fixed bug with missing BIOS on first boot of Virtual Jaguar. --- src/gui/controllerwidget.cpp | 29 +++++++++++++++++++++++++++++ src/gui/controllerwidget.h | 17 +++++++++++++++++ src/gui/mainwin.cpp | 2 ++ virtualjaguar.pro | 2 ++ 4 files changed, 50 insertions(+) create mode 100644 src/gui/controllerwidget.cpp create mode 100644 src/gui/controllerwidget.h diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp new file mode 100644 index 0000000..c33a863 --- /dev/null +++ b/src/gui/controllerwidget.cpp @@ -0,0 +1,29 @@ +// +// controllerwidget.cpp: A widget for changing "Controller" configuration +// +// Part of the Virtual Jaguar Project +// (C) 2011 Underground Software +// See the README and GPLv3 files for licensing and warranty information +// +// JLH = James L. Hammons +// +// WHO WHEN WHAT +// --- ---------- ------------------------------------------------------------ +// JLH 07/20/2011 Created this file +// + +#include "controllerwidget.h" + +//#include "joystick.h" +//#include "keygrabber.h" +//#include "settings.h" + + +ControllerWidget::ControllerWidget(QWidget * parent/*= 0*/): QWidget(parent) +{ +} + +ControllerWidget::~ControllerWidget() +{ +} + diff --git a/src/gui/controllerwidget.h b/src/gui/controllerwidget.h new file mode 100644 index 0000000..09dae52 --- /dev/null +++ b/src/gui/controllerwidget.h @@ -0,0 +1,17 @@ +#ifndef __CONTROLLERWIDGET_H__ +#define __CONTROLLERWIDGET_H__ + +#include + +class ControllerWidget: public QWidget +{ + Q_OBJECT + + public: + ControllerWidget(QWidget * parent = 0); + ~ControllerWidget(); + + //need paint, mousemove, mousedown, mouseup, etc +}; + +#endif // __CONTROLLERWIDGET_H__ diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index 83d0a53..5794f2b 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -274,6 +274,8 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit // Attempt to load/run the ABS file... LoadSoftware(vjs.absROMPath); } + else + memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Otherwise, use the stock BIOS } void MainWin::closeEvent(QCloseEvent * event) diff --git a/virtualjaguar.pro b/virtualjaguar.pro index 60653bf..abc4e7f 100644 --- a/virtualjaguar.pro +++ b/virtualjaguar.pro @@ -57,6 +57,7 @@ HEADERS = \ src/gui/app.h \ src/gui/configdialog.h \ src/gui/controllertab.h \ + src/gui/controllerwidget.h \ src/gui/filelistmodel.h \ src/gui/filepicker.h \ src/gui/filethread.h \ @@ -72,6 +73,7 @@ SOURCES = \ src/gui/app.cpp \ src/gui/configdialog.cpp \ src/gui/controllertab.cpp \ + src/gui/controllerwidget.cpp \ src/gui/filelistmodel.cpp \ src/gui/filepicker.cpp \ src/gui/filethread.cpp \ -- 2.37.2