NETPLAY:Changed it so if your set to ready the disconnect button is greyed out if your host the change game button is also greyed out.
OTHER:Some other misc ///////////'s clean up. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4207 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
eb9f6cd7a1
commit
8b2d991be4
|
@ -56,9 +56,8 @@
|
||||||
#include <wx/datetime.h> // wxWidgets
|
#include <wx/datetime.h> // wxWidgets
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
// ------------
|
||||||
// Aui events
|
// Aui events
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
|
|
||||||
void CFrame::OnManagerResize(wxAuiManagerEvent& event)
|
void CFrame::OnManagerResize(wxAuiManagerEvent& event)
|
||||||
{
|
{
|
||||||
|
@ -196,12 +195,10 @@ void CFrame::ToggleConsole(bool _show, int i)
|
||||||
// Make sure the check is updated (if wxw isn't calling this func)
|
// Make sure the check is updated (if wxw isn't calling this func)
|
||||||
//GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(Show);
|
//GetMenuBar()->FindItem(IDM_CONSOLEWINDOW)->Check(Show);
|
||||||
}
|
}
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
// ------------
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Notebooks
|
// Notebooks
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
void CFrame::ClosePages()
|
void CFrame::ClosePages()
|
||||||
{
|
{
|
||||||
DoToggleWindow(IDM_LOGWINDOW, false);
|
DoToggleWindow(IDM_LOGWINDOW, false);
|
||||||
|
@ -648,14 +645,10 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
|
// ------------
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Functions
|
// Functions
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
|
|
||||||
void CFrame::ResetToolbarStyle()
|
void CFrame::ResetToolbarStyle()
|
||||||
{
|
{
|
||||||
|
@ -1054,14 +1047,10 @@ void CFrame::AddPane()
|
||||||
AddRemoveBlankPage();
|
AddRemoveBlankPage();
|
||||||
m_Mgr->Update();
|
m_Mgr->Update();
|
||||||
}
|
}
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
|
// ------------
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Utility
|
// Utility
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
|
|
||||||
int CFrame::Limit(int i, int Low, int High)
|
int CFrame::Limit(int i, int Low, int High)
|
||||||
{
|
{
|
||||||
|
@ -1267,4 +1256,3 @@ void CFrame::HideAllNotebooks(bool Window)
|
||||||
}
|
}
|
||||||
m_Mgr->Update();
|
m_Mgr->Update();
|
||||||
}
|
}
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
@ -42,9 +42,9 @@
|
||||||
#include "BootManager.h"
|
#include "BootManager.h"
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
// ------------
|
||||||
// Main window
|
// Main window
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
IMPLEMENT_APP(DolphinApp)
|
IMPLEMENT_APP(DolphinApp)
|
||||||
|
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
|
@ -308,9 +308,9 @@ bool DolphinApp::OnInit()
|
||||||
wxPoint(100, 100), wxSize(800, 600), false, UseLogger);
|
wxPoint(100, 100), wxSize(800, 600), false, UseLogger);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------
|
// ------------
|
||||||
// Check the autoboot options.
|
// Check the autoboot options.
|
||||||
// ---------------------
|
|
||||||
// First check if we have a elf command line. Todo: Should we place this under #if wxUSE_CMDLINE_PARSER?
|
// First check if we have a elf command line. Todo: Should we place this under #if wxUSE_CMDLINE_PARSER?
|
||||||
if (LoadElf && ElfFile != wxEmptyString)
|
if (LoadElf && ElfFile != wxEmptyString)
|
||||||
{
|
{
|
||||||
|
@ -348,12 +348,11 @@ void DolphinApp::OnEndSession()
|
||||||
{
|
{
|
||||||
SConfig::GetInstance().SaveSettings();
|
SConfig::GetInstance().SaveSettings();
|
||||||
}
|
}
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
// ------------
|
||||||
// Talk to GUI
|
// Talk to GUI
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
|
|
||||||
// g_VideoInitialize.pSysMessage() goes here
|
// g_VideoInitialize.pSysMessage() goes here
|
||||||
void Host_SysMessage(const char *fmt, ...)
|
void Host_SysMessage(const char *fmt, ...)
|
||||||
|
@ -452,7 +451,7 @@ void Host_UpdateBreakPointView()
|
||||||
|
|
||||||
|
|
||||||
// Update Wiimote status bar
|
// Update Wiimote status bar
|
||||||
// ッッッッッッッッッッッッッ
|
|
||||||
void Host_UpdateLeds(int led_bits)
|
void Host_UpdateLeds(int led_bits)
|
||||||
{
|
{
|
||||||
// Convert it to a simpler byte format
|
// Convert it to a simpler byte format
|
||||||
|
@ -552,4 +551,3 @@ void Host_SetWiiMoteConnectionState(int _State)
|
||||||
wxPostEvent(main_frame, event);
|
wxPostEvent(main_frame, event);
|
||||||
}
|
}
|
||||||
#endif // HAVE_WX
|
#endif // HAVE_WX
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
@ -381,9 +381,12 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
|
||||||
buffer = ">> "+m_nick+" is now Unready !\n";
|
buffer = ">> "+m_nick+" is now Unready !\n";
|
||||||
|
|
||||||
m_ready = !m_ready;
|
m_ready = !m_ready;
|
||||||
|
m_Disconnect->Enable(!(m_ready));
|
||||||
|
|
||||||
if (m_isHosting == 1)
|
if (m_isHosting == 1)
|
||||||
{
|
{
|
||||||
|
m_ChangeGame->Enable(!(m_ready));
|
||||||
|
|
||||||
if (m_numClients > 0)
|
if (m_numClients > 0)
|
||||||
{
|
{
|
||||||
int buffer_size = (int)buffer.size();
|
int buffer_size = (int)buffer.size();
|
||||||
|
@ -460,8 +463,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
|
||||||
// TODO : there seems to be a random bug here that i can't reproduce... looked like a loop bug :/
|
// TODO : there seems to be a random bug here that i can't reproduce... looked like a loop bug :/
|
||||||
wxString chat_str = wxString::Format(wxT("> %s : %s\n"), wxString(m_nick.c_str(), wxConvUTF8).c_str() , m_Chat->GetValue().c_str() );
|
wxString chat_str = wxString::Format(wxT("> %s : %s\n"), wxString(m_nick.c_str(), wxConvUTF8).c_str() , m_Chat->GetValue().c_str() );
|
||||||
int chat_size = (int)chat_str.size();
|
int chat_size = (int)chat_str.size();
|
||||||
int nick_size = m_nick.size();
|
if(chat_size-m_nick.size()-6 > 0)
|
||||||
if(chat_size-nick_size-6 > 0)
|
|
||||||
{
|
{
|
||||||
m_Chat->Clear();
|
m_Chat->Clear();
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,6 @@ bool Renderer::Init()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decide frambuffer size
|
// Decide frambuffer size
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
int W = (int)OpenGL_GetBackbufferWidth(), H = (int)OpenGL_GetBackbufferHeight();
|
int W = (int)OpenGL_GetBackbufferWidth(), H = (int)OpenGL_GetBackbufferHeight();
|
||||||
if (g_Config.bNativeResolution)
|
if (g_Config.bNativeResolution)
|
||||||
{
|
{
|
||||||
|
@ -321,7 +320,6 @@ bool Renderer::Init()
|
||||||
|
|
||||||
// Disable the 2x option
|
// Disable the 2x option
|
||||||
if (!g_Config.b2xResolution && (W < 1280 || H < 960)) g_Config.bAllow2xResolution = false;
|
if (!g_Config.b2xResolution && (W < 1280 || H < 960)) g_Config.bAllow2xResolution = false;
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
|
||||||
|
|
||||||
if (GL_REPORT_ERROR() != GL_NO_ERROR)
|
if (GL_REPORT_ERROR() != GL_NO_ERROR)
|
||||||
bSuccess = false;
|
bSuccess = false;
|
||||||
|
|
Loading…
Reference in New Issue