ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed macro for disallowing copy-ctor and =operator into an inheritable class. Removed IrPointer.ini (no longer used) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6421 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak 2010-11-15 05:29:10 +00:00
parent b4ffd640b7
commit 73ed235fd1
10 changed files with 17 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
Data/User/Config/IrPointer.ini
View File

@ -1,182 +0,0 @@
[Default]
IRLeft = 266
IRTop = 215
IRWidth = 486
IRHeight = 490
[RSPE] # Wii Sports (NTSC)
IRLeft = 266
IRTop = 215
IRWidth = 486
IRHeight = 490
[RSPP] # Wii Sports (PAL)
IRLeft = 266
IRTop = 215
IRWidth = 486
IRHeight = 490
[RMGE] # Mario Galaxy (NTSC)
IRLeft = 255
IRTop = 278
IRWidth = 452
IRHeight = 456
[RMGP] # Mario Galaxy (PAL)
IRLeft = 255
IRTop = 278
IRWidth = 452
IRHeight = 456
[RMCE] # Mario Kart Wii (NTSC)
IRLeft = 253
IRTop = 272
IRWidth = 454
IRHeight = 455
[RMCP] # Mario Kart Wii (PAL)
IRLeft = 254
IRTop = 278
IRWidth = 451
IRHeight = 448
[R7PE] # Punch Out (NTSC)
IRLeft = 265
IRTop = 289
IRWidth = 408
IRHeight = 416
[R7PP] # Punch Out (PAL)
IRLeft = 265
IRTop = 289
IRWidth = 408
IRHeight = 416
[RZDE] # Zelda - Twilight Princess (NTSC)
IRLeft = 233
IRTop = 181
IRWidth = 559
IRHeight = 409
[RZDP] # Zelda - Twilight Princess (PAL)
IRLeft = 233
IRTop = 181
IRWidth = 559
IRHeight = 409
[RM8E] # Mario Part 8 (NTSC)
IRLeft = 277
IRTop = 273
IRWidth = 460
IRHeight = 394
[RM8P] # Mario Part 8 (PAL)
IRLeft = 277
IRTop = 273
IRWidth = 460
IRHeight = 394
[R8PE] # Super Paper Mario (NTSC)
IRLeft = 399
IRTop = 373
IRWidth = 227
IRHeight = 228
[R8PP] # Super Paper Mario (PAL)
IRLeft = 399
IRTop = 373
IRWidth = 227
IRHeight = 228
[R4QP] # Mario Strikers (NTSC)
IRLeft = 200
IRTop = 54
IRWidth = 615
IRHeight = 657
[R4QP] # Mario Strikers (PAL)
IRLeft = 200
IRTop = 54
IRWidth = 615
IRHeight = 657
[RBUE] # Resident Evil - The Umbrella Chronicles (NTSC)
IRLeft = 335
IRTop = 351
IRWidth = 357
IRHeight = 273
[RBUP] # Resident Evil - The Umbrella Chronicles (PAL)
IRLeft = 335
IRTop = 351
IRWidth = 357
IRHeight = 273
[RB4E] # Resident Evil 4 (NTSC)
IRLeft = 286
IRTop = 256
IRWidth = 450
IRHeight = 455
[RB4P] # Resident Evil 4 (PAL)
IRLeft = 286
IRTop = 256
IRWidth = 450
IRHeight = 455
[R3IJ] # Metroid Prime - Wii De Asobu (JAP)
IRLeft = 228
IRTop = 112
IRWidth = 486
IRHeight = 577
[RM3E] # Metroid Prime 3 (NTSC)
IRLeft = 258
IRTop = 84
IRWidth = 489
IRHeight = 613
[RM3P] # Metroid Prime 3 (PAL)
IRLeft = 258
IRTop = 84
IRWidth = 489
IRHeight = 613
[RSUP] # Sports Party (NTSC)
IRLeft = 391
IRTop = 377
IRWidth = 241
IRHeight = 225
[RSUP] # Sports Party (PAL)
IRLeft = 391
IRTop = 377
IRWidth = 241
IRHeight = 225
[RDZE] # Disaster - Day of Crisis (NTSC)
IRLeft = 253
IRTop = 276
IRWidth = 453
IRHeight = 421
[RDZP] # Disaster - Day of Crisis (PAL)
IRLeft = 253
IRTop = 276
IRWidth = 453
IRHeight = 421
[R4QE] # Mario Strikers (NTSC)
IRLeft = 266
IRTop = 215
IRWidth = 486
IRHeight = 490
[R4QP] # Mario Strikers (PAL)
IRLeft = 266
IRTop = 215
IRWidth = 486
IRHeight = 490
[RPBE] # Pokemon Battle Revolution (NTSC)
IRLeft = 287
IRTop = 261
IRWidth = 451
IRHeight = 449
[RPBP] # Pokemon Battle Revolution (PAL)
IRLeft = 287
IRTop = 261
IRWidth = 451
IRHeight = 449
[R2GJ] # Fragile: Sayonara Tsuki no Haikyo (JAP)
IRLeft = 254
IRTop = 280
IRWidth = 451
IRHeight = 453
[RFNE] # Wii Fit (NTSC)
[RFNP] # Wii Fit (PAL)
[RSBE] # Super Smash Bros. Brawl (NTSC)
[RSBP] # Super Smash Bros. Brawl (PAL)
[R3TE] # Top Spin 3 (NTSC)
[RSBP] # Top Spin 3 (PAL)
[RLBE] # Lego Batman (NTSC)
[RLBP] # Lego Batman (PAL)
##########################################################################
# These games don't use the IR Pointer at any time
##########################################################################
[RSRE] # Sonic and the Secret Rings (NTSC)
[RSRP] # Sonic and the Secret Rings (PAL)
[RWLE] # Wario Land - Shake It (NTSC)
[RWLP] # Wario Land - Shake It (PAL)
[RTNE] # Tenchu: Shadow Assassins (NTSC)
[RTNE] # Tenchu: Shadow Assassins (PAL)

14
Source/Core/Common/Src/Common.h
View File

@ -38,11 +38,15 @@ extern const char *netplay_dolphin_ver;
#define STACKALIGN
// A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
// An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable
{
protected:
NonCopyable() {}
private:
NonCopyable(const NonCopyable&);
void operator=(const NonCopyable&);
};
#include "Log.h"
#include "CommonTypes.h"

3
Source/Core/Common/Src/LogManager.h
View File

@ -106,7 +106,7 @@ namespace Common {
class CriticalSection;
}
class LogManager
class LogManager : NonCopyable
{
private:
LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
@ -117,7 +117,6 @@ private:
LogManager();
~LogManager();
DISALLOW_COPY_AND_ASSIGN(LogManager);
public:
static u32 GetMaxLevel() { return MAX_LOGLEVEL; }

4
Source/Core/Core/Src/ConfigManager.h
View File

@ -39,7 +39,7 @@ enum INTERFACE_LANGUAGE
INTERFACE_OTHER,
};
struct SConfig
struct SConfig : NonCopyable
{
// Wii Devices
bool m_WiiSDCard;
@ -111,8 +111,6 @@ private:
~SConfig();
static SConfig* m_Instance;
DISALLOW_COPY_AND_ASSIGN(SConfig);
};
#endif // endif config manager

4
Source/Core/Core/Src/PluginManager.h
View File

@ -40,7 +40,7 @@ private:
typedef std::vector<CPluginInfo>CPluginInfos;
class CPluginManager
class CPluginManager : NonCopyable
{
public:
static CPluginManager& GetInstance() {return(*m_Instance);}
@ -78,8 +78,6 @@ private:
~CPluginManager();
void GetPluginInfo(CPluginInfo *&info, std::string Filename);
void *LoadPlugin(const char *_rFilename);
DISALLOW_COPY_AND_ASSIGN(CPluginManager);
};

4
Source/Core/DSPCore/Src/DSPEmitter.h
View File

@ -27,7 +27,7 @@
typedef u32 (*CompiledCode)();
class DSPEmitter : public Gen::XCodeBlock
class DSPEmitter : public Gen::XCodeBlock, NonCopyable
{
public:
DSPEmitter();
@ -117,8 +117,6 @@ private:
// Counts down.
// int cycles;
DISALLOW_COPY_AND_ASSIGN(DSPEmitter);
void ToMask(Gen::X64Reg value_reg = Gen::EDI, Gen::X64Reg temp_reg = Gen::ESI);
void dsp_increment_one(Gen::X64Reg ar = Gen::EAX, Gen::X64Reg wr = Gen::EDX, Gen::X64Reg wr_pow = Gen::EDI, Gen::X64Reg temp_reg = Gen::ESI);
void dsp_decrement_one(Gen::X64Reg ar = Gen::EAX, Gen::X64Reg wr = Gen::EDX, Gen::X64Reg wr_pow = Gen::EDI, Gen::X64Reg temp_reg = Gen::ESI);

5
Source/Core/VideoCommon/Src/NativeVertexFormat.h
View File

@ -88,7 +88,7 @@ struct PortableVertexDeclaration
// Note that this class can't just invent arbitrary vertex formats out of its input -
// all the data loading code must always be made compatible.
class NativeVertexFormat
class NativeVertexFormat : NonCopyable
{
public:
virtual ~NativeVertexFormat() {}
@ -108,9 +108,6 @@ public:
protected:
// Let subclasses construct.
NativeVertexFormat() {}
private:
DISALLOW_COPY_AND_ASSIGN(NativeVertexFormat);
};
#endif // _NATIVEVERTEXFORMAT_H

4
Source/Core/VideoCommon/Src/VertexLoader.h
View File

@ -76,7 +76,7 @@ private:
}
};
class VertexLoader : public Gen::XCodeBlock
class VertexLoader : public Gen::XCodeBlock, NonCopyable
{
public:
VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr);
@ -124,8 +124,6 @@ private:
void WriteGetVariable(int bits, Gen::OpArg dest, void *address);
void WriteSetVariable(int bits, void *address, Gen::OpArg dest);
DISALLOW_COPY_AND_ASSIGN(VertexLoader);
};
#endif

3
Source/Plugins/Plugin_DSP_HLE/Src/DSPHandler.h
View File

@ -23,7 +23,7 @@
#include "MailHandler.h"
#include "UCodes/UCodes.h"
class CDSPHandler
class CDSPHandler : NonCopyable
{
public:
void Update(int cycles);
@ -58,7 +58,6 @@ public:
private:
CDSPHandler();
~CDSPHandler();
DISALLOW_COPY_AND_ASSIGN(CDSPHandler);
// singleton instance
static CDSPHandler* m_pInstance;

5
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.h
View File

@ -23,7 +23,7 @@
#define STATISTICS 1
// NEVER inherit from this class.
struct Config
struct Config : NonCopyable
{
Config();
void Load();
@ -44,9 +44,6 @@ struct Config
u32 drawStart;
u32 drawEnd;
private:
DISALLOW_COPY_AND_ASSIGN(Config);
};
extern Config g_Config;