Fixed bug with missing BIOS on first boot of Virtual Jaguar.

diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
new file mode 100644 (file)
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 <jlhamm@acm.org>
+//
+// 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 (file)
index 0000000..09dae52
--- /dev/null
+++ b/src/gui/controllerwidget.h
@@ -0,0 +1,17 @@
+#ifndef __CONTROLLERWIDGET_H__
+#define __CONTROLLERWIDGET_H__
+
+#include <QtGui>
+
+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 83d0a53855adcd33c3a1812f226be80d39e3c2e3..5794f2b0552ade2945e7b337f5dfe2e8b6351b84 100644 (file)
--- 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 60653bfae6d4938926ba953ee62745de99a9b54a..abc4e7f9b776b91cd18c72daa74b0f2a9cc21b69 100644 (file)
--- 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 \