NETPLAY:Changed chat sending so it will only send a message if the message size is greater then 0.
OGL:Added a tool tip for the wide screen hack tho its probably wrong OTHER: Just some clean up of the ///////////////////////////////////'s git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4206 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
e04c176bba
commit
eb9f6cd7a1
|
@ -16,9 +16,9 @@
|
|||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Include
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
@ -33,26 +33,22 @@
|
|||
#include "../../Core/Src/ConfigManager.h"
|
||||
#include "FileSystemGCWii.h"
|
||||
#include "VolumeCreator.h"
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
namespace FileMon
|
||||
{
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Declarations and definitions
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
DiscIO::IVolume *OpenISO;
|
||||
DiscIO::IFileSystem *pFileSystem = NULL;
|
||||
std::vector<const DiscIO::SFileInfo *> GCFiles;
|
||||
std::string ISOFile, CurrentFile;
|
||||
bool FileAccess = true;
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Filtered files
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
bool ShowSound(std::string FileName)
|
||||
{
|
||||
std::string Ending;
|
||||
|
@ -73,12 +69,11 @@ bool ShowSound(std::string FileName)
|
|||
|
||||
return false;
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Read the GC file system
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
void ReadGC(std::string FileName)
|
||||
{
|
||||
GCFiles.clear();
|
||||
|
@ -91,12 +86,10 @@ void ReadGC(std::string FileName)
|
|||
}
|
||||
FileAccess = true;
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Check if we should play this file
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
void CheckFile(std::string File, int Size)
|
||||
{
|
||||
// Don't do anything if the log is unselected
|
||||
|
@ -118,12 +111,10 @@ void CheckFile(std::string File, int Size)
|
|||
// Update the current file
|
||||
CurrentFile = File;
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// -----------
|
||||
// Find the GC filename
|
||||
// ッッッッッッッッッッッッッッッッ
|
||||
|
||||
void FindFilename(u64 offset)
|
||||
{
|
||||
// Don't do anything if the log is unselected
|
||||
|
@ -149,7 +140,6 @@ void FindFilename(u64 offset)
|
|||
|
||||
CheckFile(File, Size);
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
} // FileMon
|
||||
|
|
|
@ -460,39 +460,43 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
|
|||
// 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() );
|
||||
int chat_size = (int)chat_str.size();
|
||||
m_Chat->Clear();
|
||||
|
||||
// If there's no distant connection, we write but we don't send
|
||||
if (m_numClients == 0) {
|
||||
m_Logging->AppendText(chat_str);
|
||||
return;
|
||||
}
|
||||
// Max size that we handle is 1024, there's no need for more
|
||||
if ((chat_str.size()+1) * sizeof(char) > 1024) {
|
||||
m_Logging->AppendText(wxT("ERROR : Packet too large !\n"));
|
||||
return;
|
||||
}
|
||||
|
||||
// Send to all
|
||||
if (m_isHosting == 1)
|
||||
int nick_size = m_nick.size();
|
||||
if(chat_size-nick_size-6 > 0)
|
||||
{
|
||||
for (int i=0; i < m_numClients ; i++) {
|
||||
// Send Chat command
|
||||
m_sock_server->Write(i, (const char*)&value, 1); // 0x30 -> Chat
|
||||
|
||||
// Send Chat string
|
||||
m_sock_server->Write(i, (const char*)&chat_size, 4);
|
||||
m_sock_server->Write(i, chat_str.mb_str(), chat_size + 1);
|
||||
m_Chat->Clear();
|
||||
|
||||
// If there's no distant connection, we write but we don't send
|
||||
if (m_numClients == 0) {
|
||||
m_Logging->AppendText(chat_str);
|
||||
return;
|
||||
}
|
||||
// Max size that we handle is 1024, there's no need for more
|
||||
if ((chat_str.size()+1) * sizeof(char) > 1024) {
|
||||
m_Logging->AppendText(wxT("ERROR : Packet too large !\n"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
m_sock_client->Write((const char*)&value, 1);
|
||||
m_sock_client->Write((const char*)&chat_size, 4);
|
||||
m_sock_client->Write(chat_str.mb_str(), chat_size + 1);
|
||||
}
|
||||
|
||||
// Do not wait for the server, just write as soon as sent
|
||||
m_Logging->AppendText(chat_str);
|
||||
// Send to all
|
||||
if (m_isHosting == 1)
|
||||
{
|
||||
for (int i=0; i < m_numClients ; i++) {
|
||||
// Send Chat command
|
||||
m_sock_server->Write(i, (const char*)&value, 1); // 0x30 -> Chat
|
||||
|
||||
// Send Chat string
|
||||
m_sock_server->Write(i, (const char*)&chat_size, 4);
|
||||
m_sock_server->Write(i, chat_str.mb_str(), chat_size + 1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
m_sock_client->Write((const char*)&value, 1);
|
||||
m_sock_client->Write((const char*)&chat_size, 4);
|
||||
m_sock_client->Write(chat_str.mb_str(), chat_size + 1);
|
||||
}
|
||||
|
||||
// Do not wait for the server, just write as soon as sent
|
||||
m_Logging->AppendText(chat_str);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -255,8 +255,11 @@ void GFXConfigDialogOGL::CreateGUIControls()
|
|||
wxT("\n\nApplies instanty during gameplay: <Yes>"));
|
||||
m_2xResolution->SetToolTip(wxT(
|
||||
"Applies instanty during gameplay: <Yes, if allowed>"));
|
||||
m_WidescreenHack->SetToolTip(wxT(
|
||||
"Applies instanty during gameplay: <Yes>"));
|
||||
m_WidescreenHack->SetToolTip(
|
||||
wxT("This multiplys a perpective projection value to increase the amount being")
|
||||
wxT("\nshown instead of stretching the screen, this may cause graphical problems")
|
||||
wxT("\nin some games")
|
||||
wxT("\n\nApplies instanty during gameplay: <Yes>"));
|
||||
m_Crop->SetToolTip(
|
||||
wxT("Crop the picture instead of creating a letterbox. It will assume that your screen")
|
||||
wxT("\nis of the 5:4 format if you have selected the 4:3 aspect ratio. It will assume")
|
||||
|
|
Loading…
Reference in New Issue