diff --git a/360/media/a.png b/360/media/a.png
new file mode 100644
index 0000000000..aebd42d050
Binary files /dev/null and b/360/media/a.png differ
diff --git a/360/media/b.png b/360/media/b.png
new file mode 100644
index 0000000000..a5cfc50eba
Binary files /dev/null and b/360/media/b.png differ
diff --git a/360/menu.cpp b/360/menu.cpp
index 09e79abf61..72bd0b5ecf 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -29,9 +29,6 @@
#include "../general.h"
CSSNES app;
-HXUIOBJ hMainScene;
-HXUIOBJ hFileBrowser;
-HXUIOBJ hSSNESSettings;
filebrowser_t browser;
char strbuffer[1024];
@@ -143,7 +140,7 @@ HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
}
else if(hObjPressed == m_back)
{
- NavigateBack(hMainScene);
+ NavigateBack(app.hMainScene);
}
bHandled = TRUE;
@@ -159,14 +156,14 @@ HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
}
else if ( hObjPressed == m_back )
{
- HRESULT hr = XuiSceneNavigateBack(hSSNESSettings, hMainScene, XUSER_INDEX_FOCUS);
+ HRESULT hr = XuiSceneNavigateBack(app.hSSNESSettings, app.hMainScene, XUSER_INDEX_FOCUS);
if (FAILED(hr))
{
SSNES_ERR("Failed to load scene.\n");
}
- NavigateBack(hMainScene);
+ NavigateBack(app.hMainScene);
}
bHandled = TRUE;
return S_OK;
@@ -178,25 +175,25 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
if ( hObjPressed == m_filebrowser )
{
- hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_filebrowser.xur", NULL, &hFileBrowser);
+ hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_filebrowser.xur", NULL, &app.hFileBrowser);
if (FAILED(hr))
{
SSNES_ERR("Failed to load scene.\n");
}
- NavigateForward(hFileBrowser);
+ NavigateForward(app.hFileBrowser);
}
else if ( hObjPressed == m_settings )
{
- hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &hSSNESSettings);
+ hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &app.hSSNESSettings);
if (FAILED(hr))
{
SSNES_ERR("Failed to load scene.\n");
}
- NavigateForward(hSSNESSettings);
+ NavigateForward(app.hSSNESSettings);
}
else if ( hObjPressed == m_quit )
{
@@ -238,14 +235,14 @@ int menu_init (void)
return 1;
}
- hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &hMainScene);
+ hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &app.hMainScene);
if (FAILED(hr))
{
SSNES_ERR("Failed to create scene 'ssnes_main.xur'.\n");
return 1;
}
- XuiSceneNavigateFirst(app.GetRootObj(), hMainScene, XUSER_INDEX_FOCUS);
+ XuiSceneNavigateFirst(app.GetRootObj(), app.hMainScene, XUSER_INDEX_FOCUS);
return 0;
}
diff --git a/360/menu.h b/360/menu.h
index bf0e31f06c..180eb7fc4d 100644
--- a/360/menu.h
+++ b/360/menu.h
@@ -6,6 +6,10 @@
class CSSNES : public CXuiModule
{
+public:
+ HXUIOBJ hMainScene;
+ HXUIOBJ hFileBrowser;
+ HXUIOBJ hSSNESSettings;
protected:
/* Override so that Cssnes can register classes */
virtual HRESULT RegisterXuiClasses();
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index ed8708be94..cf610b4161 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -426,6 +426,38 @@
xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur"
+
+
+ Document
+ copy %(FullPath) $(OutDir)media\a.png
+ copy %(FullPath) $(OutDir)media\a.png
+ copy %(FullPath) $(OutDir)media\a.png
+ copy %(FullPath) $(OutDir)media\a.png
+ copy %(FullPath) $(OutDir)media\a.png
+ copy %(FullPath) $(OutDir)media\a.png
+ $(OutDir)media\a.png;%(Outputs)
+ $(OutDir)media\a.png;%(Outputs)
+ $(OutDir)media\a.png;%(Outputs)
+ $(OutDir)media\a.png;%(Outputs)
+ $(OutDir)media\a.png;%(Outputs)
+ $(OutDir)media\a.png;%(Outputs)
+
+
+ Document
+ copy %(FullPath) $(OutDir)media\b.png
+ copy %(FullPath) $(OutDir)media\b.png
+ copy %(FullPath) $(OutDir)media\b.png
+ copy %(FullPath) $(OutDir)media\b.png
+ copy %(FullPath) $(OutDir)media\b.png
+ copy %(FullPath) $(OutDir)media\b.png
+ $(OutDir)media\b.png;%(Outputs)
+ $(OutDir)media\b.png;%(Outputs)
+ $(OutDir)media\b.png;%(Outputs)
+ $(OutDir)media\b.png;%(Outputs)
+ $(OutDir)media\b.png;%(Outputs)
+ $(OutDir)media\b.png;%(Outputs)
+
+
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index 0d26ba7c46..36ee81b2d7 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -240,5 +240,11 @@
Source Files\media
+
+ Source Files\media
+
+
+ Source Files\media
+
\ No newline at end of file