From 3b76f6dc80c50737c79051461f86eb18c4a13b1d Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 8 Sep 2009 16:07:13 +0000 Subject: [PATCH] =?UTF-8?q?get=20rid=20of=20the=20'=C2=AF'=20chars=20in=20?= =?UTF-8?q?source=20code...non=20ascii=20chars=20are=20not=20really=20good?= =?UTF-8?q?=20to=20have=20floating=20around=20for=20no=20reason.=20http://?= =?UTF-8?q?google-styleguide.googlecode.com/svn/trunk/cppguide.xml=3Fshowo?= =?UTF-8?q?ne=3DNon-ASCII=5FCharacters#Non-ASCII=5FCharacters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4231 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/Mixer.cpp | 2 +- Source/Core/Common/Src/ConsoleListener.cpp | 2 +- Source/Core/Common/Src/Timer.cpp | 2 +- Source/Core/Core/Src/Core.cpp | 2 +- Source/Core/Core/Src/CoreRerecording.cpp | 12 +++---- Source/Core/Core/Src/PluginManager.cpp | 16 +++++----- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 6 ++-- .../Core/DebuggerWX/Src/BreakpointWindow.cpp | 4 +-- Source/Core/DebuggerWX/Src/CodeWindow.cpp | 4 +-- Source/Core/DebuggerWX/Src/CodeWindow.h | 2 +- .../DebuggerWX/Src/CodeWindowFunctions.cpp | 8 ++--- Source/Core/DolphinWX/Src/BootManager.cpp | 2 +- Source/Core/DolphinWX/Src/Frame.h | 2 +- Source/Core/DolphinWX/Src/FrameAui.cpp | 8 ++--- Source/Core/DolphinWX/Src/FrameTools.cpp | 10 +++--- Source/Core/DolphinWX/Src/FrameWiimote.cpp | 2 +- Source/Core/DolphinWX/Src/Globals.h | 4 +-- Source/Core/InputCommon/Src/Configuration.cpp | 18 +++++------ .../Core/InputCommon/Src/DirectInputBase.cpp | 2 +- Source/Core/InputCommon/Src/DirectInputBase.h | 2 +- Source/Core/InputCommon/Src/SDL.cpp | 24 +++++++------- Source/Core/InputCommon/Src/SDL.h | 10 +++--- Source/Core/InputCommon/Src/XInput.cpp | 12 +++---- Source/Core/InputCommon/Src/XInput.h | 4 +-- Source/Core/VideoCommon/Src/VideoCommon.h | 2 +- .../Plugin_PadSimple/Src/GUI/ConfigDlg.cpp | 4 +-- .../Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp | 6 ++-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 10 +++--- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 2 +- Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp | 26 +++++++-------- .../Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp | 2 +- .../Plugin_nJoy_SDL/Src/GUI/AboutBox.h | 2 +- .../Src/GUI/ConfigAdvanced.cpp | 18 +++++------ .../Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 2 +- .../Plugin_nJoy_SDL/Src/GUI/ConfigBox.h | 6 ++-- .../Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp | 14 ++++---- .../Plugin_nJoy_SDL/Src/ReRecording.cpp | 10 +++--- Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp | 12 +++---- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp | 32 +++++++++---------- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h | 14 ++++---- Source/Plugins/Plugin_nJoy_SDL/readme.txt | 2 +- 41 files changed, 162 insertions(+), 162 deletions(-) diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index 4c05213f2a..2a0a0f7325 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -96,7 +96,7 @@ void CMixer::PushSamples(short *samples, int num_stereo_samples, int core_sample // ----------------------------------------------------------------------- // The auto throttle function. This loop will put a ceiling on the CPU MHz. - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ---------------------------- /* This is only needed for non-AX sound, currently directly streamed and DTK sound. For AX we call SoundStream::Update in AXTask() for example. */ diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp index 9777a0a3f6..987eb275b6 100644 --- a/Source/Core/Common/Src/ConsoleListener.cpp +++ b/Source/Core/Common/Src/ConsoleListener.cpp @@ -185,7 +185,7 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool // --------------------------------------------------------------------- // Save the current text - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------------------ DWORD cCharsRead = 0; COORD coordScreen = { 0, 0 }; diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 731f4095ac..47eec6a755 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -201,7 +201,7 @@ std::string Timer::GetTimeFormatted() // Returns a timestamp with decimals for precise time comparisons -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- double Timer::GetDoubleTime() { struct timeb tp; diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 86db7abc86..53a39eac4a 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -697,7 +697,7 @@ void Callback_VideoCopiedToXFB(bool video_update) no_framelimit--; // Custom frame limiter - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // -------------------- u32 targetfps = SConfig::GetInstance().m_Framelimit * 5; if (targetfps > 5) diff --git a/Source/Core/Core/Src/CoreRerecording.cpp b/Source/Core/Core/Src/CoreRerecording.cpp index 70cb81e719..480d59adf7 100644 --- a/Source/Core/Core/Src/CoreRerecording.cpp +++ b/Source/Core/Core/Src/CoreRerecording.cpp @@ -22,7 +22,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- #ifdef _WIN32 #include #endif @@ -66,7 +66,7 @@ // File description: Rerecording Functions -/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +/* --------------- How the timer works: We measure the time between drawn frames, not when the game is paused. So time should be a fairly comparable measure of the time it took to play the game. However the time it takes @@ -85,7 +85,7 @@ namespace Core // Declarations and definitions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------- int g_FrameCounter = 0; bool g_FrameStep = false; Common::Timer ReRecTimer; @@ -94,7 +94,7 @@ Common::Timer ReRecTimer; // Control Run, Pause, Stop and the Timer. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------- // Subtract the paused time when we run again void Run() @@ -165,7 +165,7 @@ void WindBack(int Counter) // Frame advance -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------- void FrameAdvance() { // Update status bar @@ -207,7 +207,7 @@ void FrameStepOnOff() // General functions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------- // Write to the status bar void WriteStatus() diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp index da2b296811..64f94f646b 100644 --- a/Source/Core/Core/Src/PluginManager.cpp +++ b/Source/Core/Core/Src/PluginManager.cpp @@ -18,7 +18,7 @@ // File description -/* ŻŻŻŻŻŻŻŻŻŻŻŻ +/* ------------ This file controls when plugins are loaded and unloaded from memory. Its functions scan for valid plugins when Dolphin is booted, and open the debugging and config windows. The PluginManager is @@ -27,7 +27,7 @@ */ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ #include // System #include @@ -51,7 +51,7 @@ CPluginManager CPluginManager::m_Instance; // The Plugin Manager Class -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ // The plugin manager is some sort of singleton that runs during Dolphin's entire lifespan. CPluginManager::CPluginManager() @@ -103,7 +103,7 @@ CPluginManager::~CPluginManager() // Init and Shutdown Plugins -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ // Function: Point the m_pad[] and other variables to a certain plugin bool CPluginManager::InitPlugins() { @@ -202,7 +202,7 @@ void CPluginManager::ShutdownVideoPlugin() // The PluginInfo class: Find Valid Plugins -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ /* Function: This info is used in ScanForPlugins() to check for valid plugins and and in LoadPlugin() to check that the filename we want to use is a good DLL. */ CPluginInfo::CPluginInfo(const char *_rFilename) @@ -234,7 +234,7 @@ CPluginInfo::CPluginInfo(const char *_rFilename) // Supporting functions -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ /* Return the plugin info we saved when Dolphin was started. We don't even add a function to try load a plugin name that was not found because in that case it must have been deleted while Dolphin was running. @@ -380,7 +380,7 @@ void CPluginManager::ScanForPlugins() We don't need to check if [Plugin]->IsValid() here because it will not be set by LoadPlugin() if it's not valid. */ -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ Common::PluginPAD *CPluginManager::GetPad(int controller) { if (m_pad[controller] != NULL) @@ -478,7 +478,7 @@ void CPluginManager::FreeWiimote(u32 Wiimote) // Call DLL functions -// ŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------ // Open config window. Input: _rFilename = Plugin filename , Type = Plugin type void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 8be8614313..084fb780bf 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -30,14 +30,14 @@ // Settings -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- #define JIT_OFF_OPTIONS // Compile with JIT off options // Include -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- #if JITTEST #include "../Jit64IL/Jit.h" #else @@ -59,7 +59,7 @@ // Declarations and definitions -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- void Jit(u32 em_address); diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp index ab4d5defbf..dee778c789 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp @@ -179,7 +179,7 @@ void CBreakPointWindow::OnActivated(wxListEvent& event) // Breakpoint actions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- // Clear all breakpoints void CBreakPointWindow::OnClear(wxCommandEvent& event) @@ -233,7 +233,7 @@ void CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event) // Memory check actions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& event) { diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index 5d1000fc76..b3777dd11d 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -700,7 +700,7 @@ void CCodeWindow::UpdateButtonStates() wxAuiToolBar* ToolBar = GetToolBar(); // Toolbar - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------------ if (!ToolBar) return; if (!Initialized) @@ -736,7 +736,7 @@ void CCodeWindow::UpdateButtonStates() if (ToolBar) ToolBar->Realize(); // Menu bar - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------------ GetMenuBar()->Enable(IDM_INTERPRETER, Pause); // CPU Mode GetMenuBar()->Enable(IDM_JITUNLIMITED, !Initialized); diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h index fc60662972..0a725bd008 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.h +++ b/Source/Core/DebuggerWX/Src/CodeWindow.h @@ -92,7 +92,7 @@ class CCodeWindow void UpdateManager(); // Menu bar - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------------- void OnCPUMode(wxCommandEvent& event); // CPU Mode menu void OnJITOff(wxCommandEvent& event); diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index e630d6c975..8fcb29b0d1 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -19,7 +19,7 @@ // Include -// ÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻ +// -------------- #include "Common.h" #include @@ -80,7 +80,7 @@ extern "C" // Bitmaps ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Save and load settings -// ÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻ +// ----------------------------- void CCodeWindow::Load() { IniFile ini; @@ -194,7 +194,7 @@ void CCodeWindow::Save() ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Symbols, JIT, Profiler -// ÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻ +// ---------------- void CCodeWindow::CreateMenuSymbols() { wxMenu *pSymbolsMenu = new wxMenu; @@ -443,7 +443,7 @@ void CCodeWindow::OnChangeFont(wxCommandEvent& event) // Toogle windows -// ÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻÂŻ +// ---------------- void CCodeWindow::OpenPages() { diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index 2026056173..18f49b41db 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -172,7 +172,7 @@ bool BootCore(const std::string& _rFilename) // ================================================================= // Run the game - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // -------------- #if defined(HAVE_WX) && HAVE_WX if(main_frame) { diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index a22c516ef6..20acd03b1b 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -85,7 +85,7 @@ class CFrame : public wxFrame // --------------------------------------- // Wiimote leds - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // -------------------- void ModifyStatusBar(); void CreateDestroy(int Case); void CreateLeds(); void CreateSpeakers(); diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index f7021fddc1..b8bdc6febb 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -177,7 +177,7 @@ void CFrame::ToggleConsole(bool bShow, int i) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Notebooks -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void CFrame::ClosePages() { DoToggleWindow(IDM_LOGWINDOW, false); @@ -665,7 +665,7 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Functions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void CFrame::ResetToolbarStyle() { wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes(); @@ -750,7 +750,7 @@ void CFrame::ResizeConsole() // ---------------------------------------------------------- // Get OS version - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------------ int wxBorder, Border, LowerBorder, MenuBar, ScrollBar, WidthReduction; OSVERSIONINFO osvi; ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); @@ -1066,7 +1066,7 @@ void CFrame::AddPane() //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Utility -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- int CFrame::Limit(int i, int Low, int High) { diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 97c8afb03b..fdaf6712f0 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -95,7 +95,7 @@ wxInfoWindow* InfoWindow; // Create menu items -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void CFrame::CreateMenu() { if (GetMenuBar()) GetMenuBar()->Destroy(); @@ -254,7 +254,7 @@ void CFrame::CreateMenu() // Create toolbar items -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar) { int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(), @@ -434,7 +434,7 @@ void CFrame::InitBitmaps() // Menu items -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- // Start the game or change the disc void CFrame::BootGame() @@ -722,7 +722,7 @@ void CFrame::StatusBarMessage(char * Text, ...) // Miscellaneous menus -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- // NetPlay stuff void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event)) { @@ -849,7 +849,7 @@ void CFrame::OnFrameSkip(wxCommandEvent& event) // GUI -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- // Update the enabled/disabled status void CFrame::UpdateGUI() diff --git a/Source/Core/DolphinWX/Src/FrameWiimote.cpp b/Source/Core/DolphinWX/Src/FrameWiimote.cpp index cd68083b2d..b11d824954 100644 --- a/Source/Core/DolphinWX/Src/FrameWiimote.cpp +++ b/Source/Core/DolphinWX/Src/FrameWiimote.cpp @@ -18,7 +18,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- #include "Globals.h" #include "Frame.h" #include "FileUtil.h" diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index fce21b2af8..f6b5c46d6d 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -117,7 +117,7 @@ enum // -------------------------------------------------------------- // Debugger Menu Entries - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // -------------------- // CPU Mode IDM_INTERPRETER, //IDM_DUALCORE, // not used @@ -167,7 +167,7 @@ enum // -------------------------------------------------------------- // Debugger Toolbar - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // -------------------- ID_TOOLBAR_DEBUG, IDM_DEBUG_GO, IDM_STEP, diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp index 1909fe2264..f7f25d2cfe 100644 --- a/Source/Core/InputCommon/Src/Configuration.cpp +++ b/Source/Core/InputCommon/Src/Configuration.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: Input Configuration and Calibration // Description: Common SDL Input Functions // @@ -32,7 +32,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #if defined HAVE_WX && HAVE_WX #include #endif @@ -52,7 +52,7 @@ namespace InputCommon // Degree to radian and back -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- float Deg2Rad(float Deg) { return Deg * ((float)M_PI / 180.0f); @@ -66,7 +66,7 @@ float Rad2Deg(float Rad) // Check if the pad is within the dead zone, we assume the range is 0x8000 -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- float CoordinatesToRadius(int x, int y) { return sqrt(pow((float)x, 2) + pow((float)y, 2)); @@ -90,13 +90,13 @@ bool IsDeadZone(float DeadZone, int x, int y) // Scale down stick values from 0x8000 to 0x80 -/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +/* ---------------- The value returned by SDL_JoystickGetAxis is a signed integer s16 (-32768 to 32767). The value used for the gamecube controller is an unsigned char u8 (0 to 255) with neutral at 0x80 (128), so that it's equivalent to a signed -128 to 127. */ -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- int Pad_Convert(int _val) { /* If the limits on PadState[].axis[] actually is a u16 then we don't need this @@ -119,7 +119,7 @@ int Pad_Convert(int _val) // Adjust the radius -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- void RadiusAdjustment(int &_x, int &_y, int _pad, std::string SRadius) { // Get the radius setting @@ -157,7 +157,7 @@ void RadiusAdjustment(int &_x, int &_y, int _pad, std::string SRadius) XBox 360 Wireless: 85% GameCube Controller (Third Party) with EMS Trio Linker Plus II: 60% */ -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- /* Calculate the distance from the outer edges of the box to the outer edges of the circle inside the box at any angle from 0° to 360°. The returned value is 1 + Distance, for example at most sqrt(2) in the @@ -233,7 +233,7 @@ void Square2Circle(int &_x, int &_y, int _pad, std::string SDiagonal, bool Circl // Windows Virtual Key Codes Names -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- #ifdef _WIN32 std::string VKToString(int keycode) { diff --git a/Source/Core/InputCommon/Src/DirectInputBase.cpp b/Source/Core/InputCommon/Src/DirectInputBase.cpp index 80a6a93f5c..07aef5fbab 100644 --- a/Source/Core/InputCommon/Src/DirectInputBase.cpp +++ b/Source/Core/InputCommon/Src/DirectInputBase.cpp @@ -18,7 +18,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #include "DirectInputBase.h" diff --git a/Source/Core/InputCommon/Src/DirectInputBase.h b/Source/Core/InputCommon/Src/DirectInputBase.h index e9c4678eb8..a6b1fba183 100644 --- a/Source/Core/InputCommon/Src/DirectInputBase.h +++ b/Source/Core/InputCommon/Src/DirectInputBase.h @@ -21,7 +21,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #include // System #include diff --git a/Source/Core/InputCommon/Src/SDL.cpp b/Source/Core/InputCommon/Src/SDL.cpp index 601915562d..45767f9447 100644 --- a/Source/Core/InputCommon/Src/SDL.cpp +++ b/Source/Core/InputCommon/Src/SDL.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: SDL Input // Description: Common SDL Input Functions // @@ -31,7 +31,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #define _SDL_MAIN_ // Avoid certain declarations in SDL.h #include "SDL.h" // Local #include "XInput.h" @@ -40,7 +40,7 @@ // Definitions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- int g_LastPad = 0; @@ -50,14 +50,14 @@ namespace InputCommon // Definitions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Search attached devices. Populate joyinfo for all attached physical devices. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------------- bool SearchDevices(std::vector &_joyinfo, int &_NumPads, int &_NumGoodPads) { /* SDL 1.3 use DirectInput instead of the old Microsoft Multimedia API, and with this we need @@ -113,16 +113,16 @@ bool SearchDevices(std::vector &_joyinfo, int &_NumPads, int &_ // Supporting functions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- // Read current joystick status -/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +/* ---------------- The value PadMapping[].buttons[] is the number of the assigned joypad button, PadState[].buttons[] is the status of the button, it becomes 0 (no pressed) or 1 (pressed) */ // Read buttons status. Called from GetJoyState(). -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------- void ReadButton(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, int button, int NumButtons) { int ctl_button = _PadMapping.buttons[button]; @@ -133,7 +133,7 @@ void ReadButton(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, int } // Request joystick state. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------- /* Called from: PAD_GetStatus() Input: The virtual device 0, 1, 2 or 3 Function: Updates the PadState struct with the current pad status. The input value "controller" is @@ -242,10 +242,10 @@ void GetJoyState(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, in // Configure button mapping -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- // Avoid extreme axis values -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- /* Function: We have to avoid very big values to becuse some triggers are -0x8000 in the unpressed state (and then go from -0x8000 to 0x8000 as they are fully pressed) */ bool AvoidValues(int value, bool NoTriggerFilter) @@ -260,7 +260,7 @@ bool AvoidValues(int value, bool NoTriggerFilter) // Detect a pressed button -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int hats, int &KeyboardKey, int &value, int &type, int &pressed, bool &Succeed, bool &Stop, bool LeftRight, bool Axis, bool XInput, bool Button, bool Hat, bool NoTriggerFilter) diff --git a/Source/Core/InputCommon/Src/SDL.h b/Source/Core/InputCommon/Src/SDL.h index 1539111e8c..739665d7ad 100644 --- a/Source/Core/InputCommon/Src/SDL.h +++ b/Source/Core/InputCommon/Src/SDL.h @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: SDL Input // Description: Common SDL Input Functions // @@ -33,7 +33,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #include // System #include #include @@ -53,14 +53,14 @@ namespace InputCommon // Settings -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- // Show a status window with the detected axes, buttons and so on //#define SHOW_PAD_STATUS // Structures -/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +/* ------------------- CONTROLLER_STATE buttons (PadState) = 0 or 1 CONTROLLER_MAPPING buttons (joystick) = 0 or 1, 2, 3, 4, a certain joypad button @@ -225,7 +225,7 @@ struct CONTROLLER_MAPPING_NEW // GC PAD MAPPING // Declarations -// ŻŻŻŻŻŻŻŻŻ +// --------- // General functions bool SearchDevices(std::vector &_joyinfo, int &NumPads, int &NumGoodPads); diff --git a/Source/Core/InputCommon/Src/XInput.cpp b/Source/Core/InputCommon/Src/XInput.cpp index e49fe65ade..267bf4e714 100644 --- a/Source/Core/InputCommon/Src/XInput.cpp +++ b/Source/Core/InputCommon/Src/XInput.cpp @@ -22,7 +22,7 @@ // File description -/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +/* ------------------- Function: This file will get the status of the analog triggers of any connected XInput device. This code was made with the help of SimpleController.cpp in the June 2008 Microsoft DirectX SDK Samples. @@ -33,7 +33,7 @@ // Includes -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #include #include // XInput API @@ -47,7 +47,7 @@ namespace XInput // Declarations -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- #define MAX_CONTROLLERS 4 // XInput handles up to 4 controllers @@ -62,7 +62,7 @@ CONTROLER_STATE g_Controllers[MAX_CONTROLLERS]; // Init -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- /* Function: Calculate the number of connected XInput devices Todo: Implement this to figure out if there are multiple XInput controllers connected, we currently only try to connect to XInput device 0 */ @@ -92,7 +92,7 @@ void Init() // Get the trigger status -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- int GetXI(int Controller, int Button) { // Update the internal status @@ -118,7 +118,7 @@ int GetXI(int Controller, int Button) // Check if a certain controller is connected -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- bool IsConnected(int Controller) { DWORD dwResult = XInputGetState( Controller, &g_Controllers[Controller].state ); diff --git a/Source/Core/InputCommon/Src/XInput.h b/Source/Core/InputCommon/Src/XInput.h index 0c43381bd8..30ba93c79e 100644 --- a/Source/Core/InputCommon/Src/XInput.h +++ b/Source/Core/InputCommon/Src/XInput.h @@ -23,7 +23,7 @@ // Includes -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- #include @@ -34,7 +34,7 @@ namespace XInput // Declarations -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- void Init(); int GetXI(int Controller, int Button); bool IsConnected(int Controller); diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index b48ef9b0ce..26ea26b86b 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -106,7 +106,7 @@ inline float Memory_Read_Float(u32 _uAddress) // Logging -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- void HandleGLError(); diff --git a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp index 286c495146..70e896a4cb 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp @@ -89,7 +89,7 @@ PADConfigDialogSimple::~PADConfigDialogSimple() // Create input button controls -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer, const char *name, int ctl, int controller) { @@ -222,7 +222,7 @@ void PADConfigDialogSimple::CreateGUIControls() // Rerecording - // ŻŻŻŻŻŻŻŻŻ + // --------- #ifdef RERECORDING // Create controls m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording")); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp index fc0d830001..ffd3339872 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp @@ -90,9 +90,9 @@ int OSDChoice = 0, OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0; // --------------------------------------------------------------------- // OSD Menu -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- // Let's begin with 3 since 1 and 2 are default Wii keys -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- void OSDMenu(WPARAM wParam) { switch( LOWORD( wParam )) @@ -237,7 +237,7 @@ void FreeLookInput( UINT iMsg, WPARAM wParam ) // --------------------------------------------------------------------- // KeyDown events -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- void OnKeyDown(WPARAM wParam) { switch (LOWORD( wParam )) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index aeab6595eb..280d844a20 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -76,7 +76,7 @@ // Declarations and definitions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------------- CGcontext g_cgcontext; CGprofile g_cgvProf; CGprofile g_cgfProf; @@ -668,10 +668,10 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) } // Function: This function handles the OpenGL glScissor() function -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------------- // Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg() // case 0x52 > SetScissorRect() -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------------- // bpmem.scissorTL.x, y = 342x342 // bpmem.scissorBR.x, y = 981x821 // Renderer::GetTargetHeight() = the fixed ini file setting @@ -1068,12 +1068,12 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight) // We can now draw whatever we want on top of the picture. Then we copy the final picture to the output. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------------------- void Renderer::SwapBuffers() { // --------------------------------------------------------------------- // Count FPS. - // ŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ------------- static int fpscount = 0; static unsigned long lasttime; ++fpscount; diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index 0a55670b26..5a60f5c73a 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -978,7 +978,7 @@ void InterruptDebugging(bool Emu, const void* _pData) /* Returns a timestamp with three decimals for precise time comparisons. The return format is of the form seconds.milleseconds for example 1234.123. The leding seconds have no particular meaning but are just there to enable use to tell if we have entered a new second or now. */ -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- /* Calculate the current update frequency. Calculate the time between ten updates, and average five such rates. If we assume there are 60 updates per second if the game is running at full diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp index 7a8e295954..965a476f54 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -32,7 +32,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "nJoy.h" #include "Common.h" @@ -44,7 +44,7 @@ extern PADConfigDialognJoy* m_ConfigFrame; // Run when created -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- Config::Config() { // Clear the memory @@ -53,7 +53,7 @@ Config::Config() // Enable output log -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- void DEBUG_INIT() { if (pFile) @@ -71,11 +71,11 @@ void DEBUG_INIT() #ifdef _WIN32 fprintf(pFile, "Date: %s\nTime: %s\n", dateStr, timeStr); #endif - fprintf(pFile, "ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ\n"); + fprintf(pFile, "---------------\n"); } // Disable output log -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------ void DEBUG_QUIT() { if (!pFile) @@ -94,7 +94,7 @@ void DEBUG_QUIT() // Save settings to file -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- void Config::Save(int Slot) { // If there are no good pads don't save @@ -106,7 +106,7 @@ void Config::Save(int Slot) // ================================================================== // Global settings - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced); file.Set("General", "SaveByID", g_Config.bSaveByID); file.Set("General", "CheckForFocus", g_Config.bCheckFocus); @@ -125,7 +125,7 @@ void Config::Save(int Slot) // ================================================================== // Slot specific settings only - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- std::string SectionName = StringFromFormat("PAD%i", i+1); // Save the physical device ID @@ -134,7 +134,7 @@ void Config::Save(int Slot) // ================================================================== // Joypad or slot specific settings - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- // Current joypad device ID: PadMapping[i].ID // Current joypad name: joyinfo[PadMapping[i].ID].Name if(g_Config.bSaveByID) @@ -193,7 +193,7 @@ void Config::Save(int Slot) } // Load settings from file -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------------- void Config::Load(bool ChangePad, bool ChangeSaveByID) { // If there are no good pads don't load @@ -206,7 +206,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID) // ================================================================== // Global settings - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false); file.Get("General", "CheckForFocus", &g_Config.bCheckFocus, false); file.Get("General", "NoTriggerFilter", &g_Config.bNoTriggerFilter, false); @@ -234,7 +234,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID) // ================================================================== // Joypad or slot specific settings - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- // Current joypad device ID: PadMapping[i].ID // Current joypad name: joyinfo[PadMapping[i].ID].Name if(g_Config.bSaveByID) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp index 726209e308..b3e15c107d 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.h b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.h index e80abd9ce8..544675177e 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.h @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp index 3c2f50a89d..0133b91e0d 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -32,7 +32,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "ConfigBox.h" #include "../nJoy.h" #include "Images/controller.xpm" @@ -45,7 +45,7 @@ extern bool g_EmulatorRunning; bool StrangeHack = true; // Set PAD status -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- void PADConfigDialognJoy::PadGetStatus() { /* Return if it's not detected. The ID should never be less than zero here, it can only be that @@ -64,7 +64,7 @@ void PADConfigDialognJoy::PadGetStatus() // Analog stick - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- // Set Deadzones perhaps out of function //int deadzone = (int)(((float)(128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1)); //int deadzone2 = (int)(((float)(-128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1)); @@ -123,7 +123,7 @@ void PADConfigDialognJoy::PadGetStatus() // Triggers - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + // ----------------- int TriggerValue = 255; if (PadState[notebookpage].halfpress) TriggerValue = 100; @@ -159,7 +159,7 @@ void PADConfigDialognJoy::PadGetStatus() } // Show the current pad status -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- std::string ShowStatus(int VirtualController) { // Save the physical device @@ -237,7 +237,7 @@ std::string ShowStatus(int VirtualController) } // Populate the advanced tab -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- void PADConfigDialognJoy::Update() { // Check that Dolphin is in focus, otherwise don't update the pad status @@ -265,7 +265,7 @@ void PADConfigDialognJoy::Update() // Populate the advanced tab -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------- void PADConfigDialognJoy::CreateAdvancedControls(int i) { // Main-stick @@ -320,7 +320,7 @@ void PADConfigDialognJoy::CreateAdvancedControls(int i) // Rerecording - // ŻŻŻŻŻŻŻŻŻ + // --------- #ifdef RERECORDING // Create controls m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording")); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index 377f3d1faf..0664311093 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -1,5 +1,5 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h index 9d3f855ef9..c4c45cf676 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -96,7 +96,7 @@ class PADConfigDialognJoy : public wxDialog // Settings - // ŻŻŻŻŻŻŻŻŻ + // --------- wxComboBox *m_Joyname[4]; wxComboBox *m_ControlType[4], *m_TriggerType[4]; @@ -133,7 +133,7 @@ class PADConfigDialognJoy : public wxDialog // Keys - // ŻŻŻŻŻŻŻŻŻ + // --------- int g_Pressed; // Keyboard input wxTextCtrl *m_JoyShoulderL[4]; diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp index 99fc9e962a..326b3ba85b 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -32,7 +32,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "math.h" // System #include "ConfigBox.h" // Local @@ -44,7 +44,7 @@ extern bool g_EmulatorRunning; // Set dialog items from saved values -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- void PADConfigDialognJoy::UpdateGUIButtonMapping(int controller) { // http://wiki.wxwidgets.org/Converting_everything_to_and_from_wxString @@ -177,7 +177,7 @@ void PADConfigDialognJoy::SaveButtonMapping(int controller, bool DontChangeId, i } // Update the textbox for the buttons -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- void PADConfigDialognJoy::SetButtonText(int id, const char *text, int Page) { // Set controller value @@ -212,7 +212,7 @@ void PADConfigDialognJoy::SetButtonText(int id, const char *text, int Page) } // Get the text in the textbox for the buttons -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- wxString PADConfigDialognJoy::GetButtonText(int id, int Page) { // Set controller value @@ -253,11 +253,11 @@ wxString PADConfigDialognJoy::GetButtonText(int id, int Page) // Configure button mapping -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- // Wait for button press -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// --------------------- /* Loop or timer: There are basically two ways to do this. With a while() or for() loop, or with a timer. The downside with the while() or for() loop is that there is no way to stop it if the user should select to configure another button while we are still in an old loop. What will happen then diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/ReRecording.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/ReRecording.cpp index 8a0c29b5ae..858a23b1e7 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/ReRecording.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/ReRecording.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -32,7 +32,7 @@ // File description -/* ŻŻŻŻŻŻŻŻŻ +/* --------- Rerecording options @@ -41,7 +41,7 @@ Rerecording options // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "nJoy.h" #include "FileUtil.h" #include "ChunkFile.h" @@ -57,7 +57,7 @@ namespace Recording // Definitions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- // Pre defined maxium storage limit #define RECORD_SIZE (1024 * 128) SPADStatus RecordBuffer[RECORD_SIZE]; @@ -68,7 +68,7 @@ int count = 0; // Recording functions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------- void RecordInput(const SPADStatus& _rPADStatus) { if (count >= RECORD_SIZE) return; diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp index a641d18741..24a54a9686 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Rumble.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -32,13 +32,13 @@ // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "nJoy.h" // Enable or disable rumble. -// ŻŻŻŻŻŻŻŻŻ +// --------- // Rumble in windows #ifdef _WIN32 @@ -74,7 +74,7 @@ // Use PAD rumble -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- void Pad_Use_Rumble(u8 _numPAD) { @@ -130,7 +130,7 @@ void Pad_Use_Rumble(u8 _numPAD) // Set PAD rumble. Explanation: Stop = 0, Rumble = 1 -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) { @@ -189,7 +189,7 @@ void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) #ifdef _WIN32 // Rumble stuff :D! -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- // HRESULT InitRumble(HWND hWnd) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp index d1fe09ba00..5176e9b390 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -33,7 +33,7 @@ // Issues -/* ŻŻŻŻŻŻŻŻŻ +/* --------- The StrangeHack in ConfigAdvanced.cpp doesn't work in Linux, it still wont resize the window correctly. So currently in Linux you have to have advanced controls enabled when @@ -46,7 +46,7 @@ // Variables guide -/* ŻŻŻŻŻŻŻŻŻ +/* --------- Joyinfo[1, 2, 3, 4, ..., number of attached devices]: Gamepad info that is populate by Search_Devices() PadMapping[1, 2, 3 and 4]: The button mapping @@ -67,7 +67,7 @@ // Include -// ŻŻŻŻŻŻŻŻŻ +// --------- #include "nJoy.h" #include "LogManager.h" @@ -80,7 +80,7 @@ // Variables -// ŻŻŻŻŻŻŻŻŻ +// --------- #define _EXCLUDE_MAIN_ // Avoid certain declarations in nJoy.h FILE *pFile; @@ -167,10 +167,10 @@ wxWindow* GetParentedWxWindow(HWND Parent) // Input Plugin Functions (from spec's) -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------------------------ // Get properties of plugin -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------------ void GetDllInfo(PLUGIN_INFO* _PluginInfo) { _PluginInfo->Version = 0x0100; @@ -195,7 +195,7 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) // Call config dialog -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------ void DllConfig(HWND _hParent) { #ifdef _WIN32 @@ -239,7 +239,7 @@ void DllDebugger(HWND _hParent, bool Show) {} // Init PAD (start emulation) -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------------------- /* Information: This function can not be run twice without a Shutdown in between. If it's run twice the SDL_Init() will cause a crash. One solution to this is to keep a global function that remembers the SDL_Init() and SDL_Quit() (g_EmulatorRunning does @@ -279,7 +279,7 @@ void Initialize(void *init) } // Shutdown PAD (stop emulation) -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ----------------------------- /* Information: This function can not be run twice without an Initialize in between. If it's run twice the SDL_...() functions below will cause a crash. Called from: The Dolphin Core, PADConfigDialognJoy::OnClose() */ @@ -343,7 +343,7 @@ void Shutdown() // Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application. -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- void PAD_Input(u16 _Key, u8 _UpDown) { // Check that Dolphin is in focus, otherwise don't update the pad status @@ -371,7 +371,7 @@ void PAD_Input(u16 _Key, u8 _UpDown) // Save state -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- void DoState(unsigned char **ptr, int mode) { #ifdef RERECORDING @@ -381,7 +381,7 @@ void DoState(unsigned char **ptr, int mode) // Set PAD status -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// -------------- // Called from: SI_DeviceGCController.cpp // Function: Gives the current pad status to the Core void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) @@ -595,7 +595,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) // Search for SDL devices -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- bool Search_Devices(std::vector &_joyinfo, int &_NumPads, int &_NumGoodPads) { bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads, _NumGoodPads); @@ -625,7 +625,7 @@ bool Search_Devices(std::vector &_joyinfo, int &_N /* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2:: SetDataFormat() DirectX error -2147024809" after exactly four SDL_Init() and SDL_Quit() */ -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- bool ReloadDLL() { if ( (PadState[0].joy == NULL) @@ -654,7 +654,7 @@ bool ReloadDLL() // Check if Dolphin is in focus -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- bool IsFocus() { return true; diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index 9fe8ed2740..20194bef24 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -1,6 +1,6 @@ // Project description -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ------------------- // Name: nJoy // Description: A Dolphin Compatible Input Plugin // @@ -35,7 +35,7 @@ // Includes -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- #include // System #include #include @@ -80,7 +80,7 @@ // Define -// ŻŻŻŻŻŻŻŻŻŻ +// ---------- #define INPUT_VERSION "0.3" #define INPUT_STATE wxT("PUBLIC RELEASE") @@ -92,7 +92,7 @@ // Input vector. Todo: Save the configured keys here instead of in joystick -// ŻŻŻŻŻŻŻŻŻ +// --------- /* #ifndef _CONTROLLER_STATE_H extern std::vector Keys; @@ -103,7 +103,7 @@ extern std::vector Keys; // Variables -// ŻŻŻŻŻŻŻŻŻ +// --------- #ifndef _EXCLUDE_MAIN_ extern SPADInitialize *g_PADInitialize; extern FILE *pFile; @@ -120,7 +120,7 @@ extern std::vector Keys; // Custom Functions -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- bool Search_Devices(std::vector &_joyinfo, int &_NumPads, int &_NumGoodPads); void DEBUG_INIT(); void DEBUG_QUIT(); @@ -135,7 +135,7 @@ HRESULT InitRumble(HWND hWnd); // ReRecording -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +// ---------------- #ifdef RERECORDING namespace Recording { diff --git a/Source/Plugins/Plugin_nJoy_SDL/readme.txt b/Source/Plugins/Plugin_nJoy_SDL/readme.txt index d3aa4a3898..3b983a1200 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/readme.txt +++ b/Source/Plugins/Plugin_nJoy_SDL/readme.txt @@ -78,7 +78,7 @@ Where can I download the latest releases??? Can I mirror this file??? Sure, just don't forget to add a link to: www.multigesture.net OR www.dolphin-emu.com - ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + -------------------- ------------------- Why should I use nJoy instead of the default input plugin??? At this moment the default plugin only supports keyboard input. nJoy supports Joysticks. And besides that, if you have an GC-adapter