piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compile fix, remove PanicAlert from nJoy SDL

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1697 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2008-12-26 19:39:12 +00:00
parent 3db9fb4fc1
commit fb5b4d026a
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -30,7 +30,9 @@
#include "D3DPostprocess.h" #include "D3DPostprocess.h"
#include "D3DUtil.h" #include "D3DUtil.h"
#include "VertexShaderManager.h" #include "VertexShaderManager.h"
#include "VertexShaderCache.h"
#include "PixelShaderManager.h" #include "PixelShaderManager.h"
#include "PixelShaderCache.h"
#include "TextureCache.h" #include "TextureCache.h"
#include "Utils.h" #include "Utils.h"
#include "EmuWindow.h" #include "EmuWindow.h"

2
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
View File

@ -28,7 +28,9 @@
#include "BPStructs.h" #include "BPStructs.h"
#include "XFStructs.h" #include "XFStructs.h"
#include "VertexShaderManager.h" #include "VertexShaderManager.h"
#include "VertexShaderCache.h"
#include "PixelShaderManager.h" #include "PixelShaderManager.h"
#include "PixelShaderCache.h"
#include "Utils.h" #include "Utils.h"
using namespace D3D; using namespace D3D;

38
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Project description // Project description
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
// Name: nJoy // Name: nJoy
// Description: A Dolphin Compatible Input Plugin // Description: A Dolphin Compatible Input Plugin
// //
@ -32,13 +32,13 @@
//////////////////////// ////////////////////////
// Include // Include
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
#include "nJoy.h" #include "nJoy.h"
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Variables // Variables
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
// Rumble in windows // Rumble in windows
#define _CONTROLLER_STATE_H // avoid certain declarations in nJoy.h #define _CONTROLLER_STATE_H // avoid certain declarations in nJoy.h
@ -64,7 +64,7 @@ void __Logv(int log, int v, const char *format, ...) {}
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets // wxWidgets
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
class wxDLLApp : public wxApp class wxDLLApp : public wxApp
{ {
@ -81,7 +81,7 @@ void __Logv(int log, int v, const char *format, ...) {}
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// DllMain // DllMain
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
#ifdef _WIN32 #ifdef _WIN32
BOOL APIENTRY DllMain( HINSTANCE hinstDLL, // DLL module handle BOOL APIENTRY DllMain( HINSTANCE hinstDLL, // DLL module handle
DWORD dwReason, // reason called DWORD dwReason, // reason called
@ -117,10 +117,10 @@ BOOL APIENTRY DllMain( HINSTANCE hinstDLL, // DLL module handle
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Input Plugin Functions (from spec's) // Input Plugin Functions (from spec's)
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
// Get properties of plugin // Get properties of plugin
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void GetDllInfo(PLUGIN_INFO* _PluginInfo) void GetDllInfo(PLUGIN_INFO* _PluginInfo)
{ {
_PluginInfo->Version = 0x0100; _PluginInfo->Version = 0x0100;
@ -138,7 +138,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
} }
// Call config dialog // Call config dialog
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void DllConfig(HWND _hParent) void DllConfig(HWND _hParent)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -177,7 +177,7 @@ void DllDebugger(HWND _hParent, bool Show) {
} }
// Init PAD (start emulation) // Init PAD (start emulation)
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void PAD_Initialize(SPADInitialize _PADInitialize) void PAD_Initialize(SPADInitialize _PADInitialize)
{ {
emulator_running = TRUE; emulator_running = TRUE;
@ -212,7 +212,7 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
} }
// Shutdown PAD (stop emulation) // Shutdown PAD (stop emulation)
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void PAD_Shutdown() void PAD_Shutdown()
{ {
if (joysticks[0].enabled) if (joysticks[0].enabled)
@ -245,7 +245,7 @@ void PAD_Shutdown()
// Set PAD status // Set PAD status
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
{ {
if (!joysticks[_numPAD].enabled) if (!joysticks[_numPAD].enabled)
@ -365,7 +365,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// Set PAD attached pads // Set PAD attached pads
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
unsigned int PAD_GetAttachedPads() unsigned int PAD_GetAttachedPads()
{ {
unsigned int connected = 0; unsigned int connected = 0;
@ -388,10 +388,10 @@ unsigned int PAD_GetAttachedPads()
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Custom Functions // Custom Functions
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
// Read buttons status. Called from GetJoyState(). // Read buttons status. Called from GetJoyState().
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void ReadButton(int controller, int button) void ReadButton(int controller, int button)
{ {
int ctl_button = joysticks[controller].buttons[button]; int ctl_button = joysticks[controller].buttons[button];
@ -402,7 +402,7 @@ void ReadButton(int controller, int button)
} }
// Request joystick state // Request joystick state
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
void GetJoyState(int controller) void GetJoyState(int controller)
{ {
SDL_JoystickUpdate(); SDL_JoystickUpdate();
@ -420,8 +420,8 @@ void GetJoyState(int controller)
ReadButton(controller, CTL_Y_BUTTON); ReadButton(controller, CTL_Y_BUTTON);
ReadButton(controller, CTL_Z_TRIGGER); ReadButton(controller, CTL_Z_TRIGGER);
ReadButton(controller, CTL_START); ReadButton(controller, CTL_START);
// Is there a purpose to this alert?
PanicAlert("%i", CTL_A_BUTTON); // PanicAlert("%i", CTL_A_BUTTON);
// //
if (joysticks[controller].halfpress < joyinfo[controller].NumButtons) if (joysticks[controller].halfpress < joyinfo[controller].NumButtons)
@ -442,7 +442,7 @@ void GetJoyState(int controller)
} }
// Search attached devices // Search attached devices
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //
int Search_Devices() int Search_Devices()
{ {
// load config // load config
@ -475,7 +475,7 @@ int Search_Devices()
#ifdef _DEBUG #ifdef _DEBUG
fprintf(pFile, "Scanning for devices\n"); fprintf(pFile, "Scanning for devices\n");
fprintf(pFile, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"); fprintf(pFile, "\n");
#endif #endif
for(int i = 0; i < numjoy; i++ ) for(int i = 0; i < numjoy; i++ )