The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 20:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

nJoy: Small change

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2004 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-24 22:17:51 +00:00
parent a3c383ad4a
commit 0db67cf51c
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp
View File

@ -37,7 +37,6 @@
#include "../nJoy.h" #include "../nJoy.h"
#include "Images/controller.xpm" #include "Images/controller.xpm"
//extern CONTROLLER_INFO *joyinfo;
extern bool emulator_running; extern bool emulator_running;
//////////////////////// ////////////////////////
@ -246,12 +245,10 @@ std::string ShowStatus(int VirtualController)
void ConfigBox::Update() void ConfigBox::Update()
{ {
// Show the current status // Show the current status
/**/ /*
m_pStatusBar->SetLabel(wxString::Format( m_pStatusBar->SetLabel(wxString::Format(
"%s", ShowStatus(notebookpage).c_str() "%s", ShowStatus(notebookpage).c_str()
)); ));*/
Console::Print("3: %p\n", PadState[PadMapping[3].ID].joy);
//LogMsg("Abc%s\n", ShowStatus(notebookpage).c_str()); //LogMsg("Abc%s\n", ShowStatus(notebookpage).c_str());

10
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -39,8 +39,6 @@
#include "../nJoy.h" #include "../nJoy.h"
#include "Images/controller.xpm" #include "Images/controller.xpm"
//extern CONTROLLER_INFO *joyinfo;
//extern CONTROLLER_MAPPING PadMapping[4];
extern bool emulator_running; extern bool emulator_running;
// D-Pad type // D-Pad type
@ -116,7 +114,7 @@ ConfigBox::ConfigBox(wxWindow *parent, wxWindowID id, const wxString &title,
// Define values // Define values
notebookpage = 0; notebookpage = 0;
g_Pressed = 0; g_Pressed = 0;
Debugging = true; Debugging = false;
m_TCDebugging = NULL; m_TCDebugging = NULL;
ControlsCreated = false; ControlsCreated = false;
@ -927,15 +925,15 @@ void ConfigBox::CreateGUIControls()
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Debugging // Debugging
// ----------------------------- // -----------------------------
m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize); //m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize);
//m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(125, 200), wxDefaultSize); //m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(125, 200), wxDefaultSize);
//m_pStatusBar->SetLabel(wxString::Format("Debugging text")); //m_pStatusBar->SetLabel(wxString::Format("Debugging text"));
/**/m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400), /*m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400),
wxTE_RICH | wxTE_MULTILINE | wxTE_DONTWRAP | wxNO_BORDER); wxTE_RICH | wxTE_MULTILINE | wxTE_DONTWRAP | wxNO_BORDER);
wxBoxSizer * m_LogSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer * m_LogSizer = new wxBoxSizer(wxVERTICAL);
m_LogSizer->Add(m_TCDebugging, 0, wxEXPAND | (wxALL), 0); m_LogSizer->Add(m_TCDebugging, 0, wxEXPAND | (wxALL), 0);
m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5); m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5);*/
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Set window size // Set window size

1
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
View File

@ -227,7 +227,6 @@ extern std::vector<u8> Keys;
// ¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯
#ifndef _CONTROLLER_STATE_H #ifndef _CONTROLLER_STATE_H
extern FILE *pFile; extern FILE *pFile;
//extern CONTROLLER_INFO *joyinfo;
extern std::vector<CONTROLLER_INFO> joyinfo; extern std::vector<CONTROLLER_INFO> joyinfo;
extern CONTROLLER_STATE PadState[4]; extern CONTROLLER_STATE PadState[4];
extern CONTROLLER_MAPPING PadMapping[4]; extern CONTROLLER_MAPPING PadMapping[4];