From d244bca1f5f210e03839d0e0a485fc5511ede2d6 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 19 Apr 2013 09:21:45 -0400 Subject: [PATCH] Fix a bunch of random typos in comments and logging. Also update the comment headers for two functions in GCMemcard.cpp. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 2 +- Source/Core/AudioCommon/Src/XAudio2Stream.cpp | 2 +- Source/Core/Common/Src/Hash.cpp | 2 +- Source/Core/Common/Src/MemArena.h | 2 +- Source/Core/Common/Src/x64Emitter.cpp | 2 +- Source/Core/Common/Src/x64Emitter.h | 4 +-- Source/Core/Core/Src/ActionReplay.cpp | 4 +-- Source/Core/Core/Src/DSP/DSPCore.h | 4 +-- Source/Core/Core/Src/DSP/DSPIntExtOps.cpp | 4 +-- Source/Core/Core/Src/DSP/DspIntArithmetic.cpp | 2 +- .../Core/Src/DSP/Jit/DSPJitArithmetic.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp | 4 +-- .../Src/FifoPlayer/FifoPlaybackAnalyzer.cpp | 2 +- .../Core/Core/Src/FifoPlayer/FifoRecorder.h | 2 +- Source/Core/Core/Src/GeckoCode.cpp | 6 ++-- Source/Core/Core/Src/GeckoCodeConfig.cpp | 2 +- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- .../Core/Core/Src/HW/EXI_DeviceEthernet.cpp | 2 +- Source/Core/Core/Src/HW/GCMemcard.cpp | 16 ++++++---- Source/Core/Core/Src/HW/SystemTimers.cpp | 2 +- .../Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h | 2 +- .../Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 2 +- Source/Core/Core/Src/NetPlayServer.cpp | 6 ++-- .../Interpreter_SystemRegisters.cpp | 2 +- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 2 +- .../Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp | 2 +- Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp | 2 +- Source/Core/Core/Src/PowerPC/SignatureDB.cpp | 2 +- Source/Core/DiscIO/Src/CISOBlob.cpp | 2 +- Source/Core/DiscIO/Src/CompressedBlob.cpp | 6 ++-- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 2 +- .../Src/Debugger/CodeWindowFunctions.cpp | 2 +- .../DolphinWX/Src/Debugger/DebuggerPanel.h | 2 +- .../DolphinWX/Src/Debugger/MemoryWindow.cpp | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 2 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 2 +- Source/Core/DolphinWX/Src/ISOFile.cpp | 2 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 2 +- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 2 +- Source/Core/InputCommon/Src/ControllerEmu.h | 8 ++--- .../ControllerInterface/ControllerInterface.h | 6 ++-- .../DInput/DInputJoystick.cpp | 29 +++++++++---------- .../DInput/DInputKeyboardMouse.cpp | 6 ++-- .../Src/ControllerInterface/XInput/XInput.cpp | 4 +-- Source/Core/InputCommon/Src/UDPWiimote.h | 2 +- Source/Core/VideoCommon/Src/EmuWindow.cpp | 4 +-- Source/Core/VideoCommon/Src/Fifo.cpp | 4 +-- Source/Core/VideoCommon/Src/OpcodeDecoding.h | 2 +- Source/Core/VideoCommon/Src/PixelEngine.cpp | 2 +- Source/Core/VideoCommon/Src/Statistics.cpp | 16 +++++----- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 2 +- Source/Core/VideoCommon/Src/VertexLoader.cpp | 2 +- Source/Core/VideoCommon/Src/x64DLCache.cpp | 2 +- .../VideoCommon/Src/x64TextureDecoder.cpp | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- .../Src/ProgramShaderCache.cpp | 2 +- .../Plugin_VideoOGL/Src/RasterFont.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 ++--- .../Plugin_VideoOGL/Src/VertexManager.cpp | 2 +- .../Src/OpcodeDecoder.cpp | 2 +- .../Plugin_VideoSoftware/Src/Rasterizer.cpp | 2 +- .../Src/SWCommandProcessor.cpp | 6 ++-- 66 files changed, 122 insertions(+), 117 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index aad806bde1..b1e601dfe7 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -59,7 +59,7 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } - // Initialise DPL2 parameters + // Initialize DPL2 parameters dpl2reset(); soundTouch.clear(); diff --git a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp index d6f4e61a52..59a826365c 100644 --- a/Source/Core/AudioCommon/Src/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/Src/XAudio2Stream.cpp @@ -94,7 +94,7 @@ bool XAudio2::Start() { HRESULT hr; - // callback dosent seem to run on a speecific cpu anyways + // callback doesn't seem to run on a specific cpu anyways IXAudio2* xaudptr; if (FAILED(hr = XAudio2Create(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR))) { diff --git a/Source/Core/Common/Src/Hash.cpp b/Source/Core/Common/Src/Hash.cpp index 1354658835..2e221ee396 100644 --- a/Source/Core/Common/Src/Hash.cpp +++ b/Source/Core/Common/Src/Hash.cpp @@ -43,7 +43,7 @@ u32 HashFletcher(const u8* data_u8, size_t length) // Implementation from Wikipedia -// Slightly slower than Fletcher above, but slighly more reliable. +// Slightly slower than Fletcher above, but slightly more reliable. #define MOD_ADLER 65521 // data: Pointer to the data to be summed; len is in bytes u32 HashAdler32(const u8* data, size_t len) diff --git a/Source/Core/Common/Src/MemArena.h b/Source/Core/Common/Src/MemArena.h index d49b292f51..25d5c3ccbe 100644 --- a/Source/Core/Common/Src/MemArena.h +++ b/Source/Core/Common/Src/MemArena.h @@ -13,7 +13,7 @@ #include "Common.h" // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. -// Multiple views can mirror the same section of the block, which makes it very convient for emulating +// Multiple views can mirror the same section of the block, which makes it very convenient for emulating // memory mirrors. class MemArena diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 6bcf6dd3c3..c44fe22825 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -1315,7 +1315,7 @@ void XEmitter::MOVDDUP(X64Reg regOp, OpArg arg) //There are a few more left -// Also some integer instrucitons are missing +// Also some integer instructions are missing void XEmitter::PACKSSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x6B, true, dest, arg);} void XEmitter::PACKSSWB(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x63, true, dest, arg);} //void PACKUSDW(X64Reg dest, OpArg arg) {WriteSSEOp(64, 0x66, true, dest, arg);} // WRONG diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index 285be7d7f1..b068579a3a 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -107,7 +107,7 @@ struct OpArg scale = (u8)_scale; offsetOrBaseReg = (u16)rmReg; indexReg = (u16)scaledReg; - //if scale == 0 never mind offseting + //if scale == 0 never mind offsetting offset = _offset; } void WriteRex(XEmitter *emit, int opBits, int bits, int customOp = -1) const; @@ -637,7 +637,7 @@ public: void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2); void ABI_CallFunctionA(void *func, const Gen::OpArg &arg1); - // Pass a register as a paremeter. + // Pass a register as a parameter. void ABI_CallFunctionR(void *func, Gen::X64Reg reg1); void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2); diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 149705b83c..7c1742a1cb 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -14,7 +14,7 @@ // ------------------------------------------------------------------------------------------------------------- // Code Types: -// (Unconditonal) Normal Codes (0): this one has subtypes inside +// (Unconditional) Normal Codes (0): this one has subtypes inside // (Conditional) Normal Codes (1 - 7): these just compare values and set the line skip info // Zero Codes: any code with no address. These codes are used to do special operations like memory copy, etc // ------------------------------------------------------------------------------------------------------------- @@ -42,7 +42,7 @@ enum ZCODE_ROW = 0x03, ZCODE_04 = 0x04, - // Conditonal Codes + // Conditional Codes CONDTIONAL_EQUAL = 0x01, CONDTIONAL_NOT_EQUAL = 0x02, CONDTIONAL_LESS_THAN_SIGNED = 0x03, diff --git a/Source/Core/Core/Src/DSP/DSPCore.h b/Source/Core/Core/Src/DSP/DSPCore.h index 34466ea4ad..de5b309e13 100644 --- a/Source/Core/Core/Src/DSP/DSPCore.h +++ b/Source/Core/Core/Src/DSP/DSPCore.h @@ -155,14 +155,14 @@ #define SR_OVERFLOW 0x0002 #define SR_ARITH_ZERO 0x0004 #define SR_SIGN 0x0008 -#define SR_OVER_S32 0x0010 // set when there there was mod/tst/cmp on accu and result is over s32 +#define SR_OVER_S32 0x0010 // set when there was mod/tst/cmp on accu and result is over s32 #define SR_TOP2BITS 0x0020 // if the upper (ac?.m/ax?.h) 2 bits are equal #define SR_LOGIC_ZERO 0x0040 #define SR_OVERFLOW_STICKY 0x0080 // set at the same time as 0x2 (under same conditions) - but not cleared the same #define SR_100 0x0100 // unknown #define SR_INT_ENABLE 0x0200 // Not 100% sure but duddie says so. This should replace the hack, if so. #define SR_400 0x0400 // unknown -#define SR_EXT_INT_ENABLE 0x0800 // Appears in zelda - seems to disable external interupts +#define SR_EXT_INT_ENABLE 0x0800 // Appears in zelda - seems to disable external interrupts #define SR_1000 0x1000 // unknown #define SR_MUL_MODIFY 0x2000 // 1 = normal. 0 = x2 (M0, M2) (Free mul by 2) #define SR_40_MODE_BIT 0x4000 // 0 = "16", 1 = "40" (SET16, SET40) Controls sign extension when loading mid accums and data saturation for stores from mid accums. diff --git a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp b/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp index f8c89cad1d..bc448233ba 100644 --- a/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp +++ b/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp @@ -161,7 +161,7 @@ void l(const UDSPInstruction opc) // LN $axD.D, @$arS // xxxx xxxx 01dd d0ss // Load $axD.D/$acD.D with value from memory pointed by register $arS. -// Add indexing register register $ixS to register $arS. +// Add indexing register $ixS to register $arS. void ln(const UDSPInstruction opc) { u8 sreg = opc & 0x3; @@ -531,7 +531,7 @@ void applyWriteBackLog() // apply the ext command output, because if the main op didn't change the value // then 0 | ext output = ext output and if it did then bitwise or is still the // right thing to do -// Only needed for cases when when mainop and extended are modifying the same ACC +// Only needed for cases when mainop and extended are modifying the same ACC // Games are not doing that + in motorola (similar dsp) dox this is forbidden to do. void zeroWriteBackLog() { diff --git a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp index 61dd8d69e1..a88028dd78 100644 --- a/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp +++ b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp @@ -1116,7 +1116,7 @@ void lsrnr(const UDSPInstruction opc) // ASRNR $acD // 0011 111d 1xxx xxxx -// Arithmeticaly shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M +// Arithmetically shift left/right accumulator $ACC[D] by lower 7-bit (signed) value in $AC[1-D].M // x = extension (7 bits!!) // // flags out: --xx xx00 diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp index bf26e933db..8bff5c0c47 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp @@ -286,7 +286,7 @@ void DSPEmitter::cmpi(const UDSPInstruction opc) // CMPIS $acD, #I // 0000 011d iiii iiii -// Compares accumulator with short immediate. Comaprison is executed +// Compares accumulator with short immediate. Comparison is executed // by subtracting short immediate (8bit sign extended) from mid accumulator // $acD.hm and computing flags based on whole accumulator $acD. // diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp index 9fd044d3cd..5bcd13d071 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp @@ -143,7 +143,7 @@ void DSPEmitter::l(const UDSPInstruction opc) // LN $axD.D, @$arS // xxxx xxxx 01dd d0ss // Load $axD.D/$acD.D with value from memory pointed by register $arS. -// Add indexing register register $ixS to register $arS. +// Add indexing register $ixS to register $arS. void DSPEmitter::ln(const UDSPInstruction opc) { u8 sreg = opc & 0x3; @@ -686,7 +686,7 @@ void DSPEmitter::pushExtValueFromMem2(u16 dreg, u16 sreg) void DSPEmitter::popExtValueToReg() { - // in practise, we rarely ever have a non-NX main op + // in practice, we rarely ever have a non-NX main op // with an extended op, so the OR here is either // not run (storeIndex == -1) or ends up OR'ing // EBX with 0 (becoming the MOV we have here) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp index 9ddcf93a8d..1ea80c8699 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -64,7 +64,7 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector& gcodes) gcode.enabled = (1 == ss.tellg()); // silly ss.seekg(1, std::ios_base::cur); // read the code name - std::getline(ss, gcode.name, '['); // stop at [ character (begining of contributer name) + std::getline(ss, gcode.name, '['); // stop at [ character (beginning of contributor name) gcode.name = StripSpaces(gcode.name); // read the code creator name std::getline(ss, gcode.creator, ']'); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 429c9e502c..56d736c399 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -265,7 +265,7 @@ u16 AcceleratorGetSample() // stream, and the lower 16 bits are the decimal part. // // We start getting samples not from sample 0, but 0.. This -// avoids discontinuties in the audio stream, especially with very low ratios +// avoids discontinuities in the audio stream, especially with very low ratios // which interpolate a lot of values between two "real" samples. u32 ResampleAudio(std::function input_callback, s16* output, u32 count, s16* last_samples, u32 curr_pos, u32 ratio, int srctype, diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp index 84ba1e94f3..cfb8f37188 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp @@ -537,7 +537,7 @@ inline void CEXIETHERNET::inc_rwp() (*rwp)++; } -// This function is on the critical path for recving data. +// This function is on the critical path for receiving data. // Be very careful about calling into the logger and other slow things bool CEXIETHERNET::RecvHandlePacket() { diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index e27b176780..a13cdb4a2c 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -1333,8 +1333,11 @@ void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2) /* FZEROGX_MakeSaveGameValid */ /* (use just before writing a F-Zero GX system .gci file) */ /* */ -/* chn: Destination memory card port */ -/* ret: Error code */ +/* Parameters: */ +/* direntry: [Description needed] */ +/* FileBuffer: [Description needed] */ +/* */ +/* Returns: Error code */ /*************************************************************/ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) @@ -1351,7 +1354,7 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector CARD_GetSerialNo(&serial1,&serial2); // set new serial numbers - *(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16); + *(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16); *(u16*)&FileBuffer[3].block[0x1580] = BE16(BE32(serial2) >> 16); *(u16*)&FileBuffer[1].block[0x0060] = BE16(BE32(serial1) & 0xFFFF); *(u16*)&FileBuffer[1].block[0x0200] = BE16(BE32(serial2) & 0xFFFF); @@ -1378,8 +1381,11 @@ s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector /* PSO_MakeSaveGameValid */ /* (use just before writing a PSO system .gci file) */ /* */ -/* chn: Destination memory card port */ -/* ret: Error code */ +/* Parameters: */ +/* direntry: [Description needed] */ +/* FileBuffer: [Description needed] */ +/* */ +/* Returns: Error code */ /***********************************************************/ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index 8f0b7dabc8..bf77060c83 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -23,7 +23,7 @@ of frames. So if a game runs slow, on a slow computer for example, these updates will occur less frequently. This makes sense because almost all console games are controlled by frames rather than time, so if a game can't keep up with the normal framerate all animations and -actions slows down and the game runs to slow. This is different from PC games that are are +actions slows down and the game runs to slow. This is different from PC games that are often controlled by time instead and may not have maximum framerates. However, I'm not sure if the Bluetooth communication for the Wiimote is entirely frame diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h index 7d7e592c79..e7d9cb94f8 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/UDPTLayer.h @@ -45,7 +45,7 @@ namespace UDPTLayer { if (!(m->inst)) return; if (!(m->updIR)) return; - if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the recieved values are used ONLY when the normal pointer is offscreen + if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the received values are used ONLY when the normal pointer is offscreen float _x, _y; m->inst->getIR(_x, _y); *x = _x * 2 - 1; diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index 6fe46d32d5..05045de32a 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -163,7 +163,7 @@ private: ADPCMState m_adpcm_state; // read data request queue - // maybe it isn't actualy a queue + // maybe it isn't actually a queue // maybe read requests cancel any current requests std::queue< ReadRequest > m_read_requests; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 8826b6ee63..41f751cb77 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -363,7 +363,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u } else { - DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, queueing..."); + DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, queuing..."); m_acl_pool.Store(_pData, _Size, _ConnectionHandle); } } diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 50c9814fa3..4677894f72 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -107,7 +107,7 @@ void NetPlayServer::ThreadFunc() switch (ready_socket.Receive(rpac)) { case sf::Socket::Done : - // if a bad packet is recieved, disconnect the client + // if a bad packet is received, disconnect the client if (0 == OnData(rpac, ready_socket)) break; @@ -267,7 +267,7 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket) sf::Packet spac; spac << (MessageId)NP_MSG_DISABLE_GAME; - // this thread doesnt need players lock + // this thread doesn't need players lock std::lock_guard lks(m_crit.send); SendToClients(spac); } @@ -465,7 +465,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket) map = -1; // if not, they are hacking, so disconnect them - // this could happen right after a pad map change, but that isn't implimented yet + // this could happen right after a pad map change, but that isn't implemented yet if (map < 0) return 1; diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 535d6858f7..b55cbd6b45 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -433,7 +433,7 @@ void Interpreter::mcrf(UGeckoInstruction _inst) void Interpreter::isync(UGeckoInstruction _inst) { - //shouldnt do anything + //shouldn't do anything } // the following commands read from FPSCR diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 5becf018f2..04085cb34a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. -// Should give a very noticable speed boost to paired single heavy code. +// Should give a very noticeable speed boost to paired single heavy code. #include "Common.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 03d72ee335..e89f414150 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. -// Should give a very noticable speed boost to paired single heavy code. +// Should give a very noticeable speed boost to paired single heavy code. #include "Common.h" diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index 518dd65470..8299bc0b82 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -329,7 +329,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, if (!cst1_instructions.empty()) { // If the Gecko CST1 instruction queue is not empty, - // we comsume the first instruction. + // we consume the first instruction. inst = UGeckoInstruction(cst1_instructions.front()); cst1_instructions.pop(); address -= 4; diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp index b2785fbe1c..1292f1e6c3 100644 --- a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp +++ b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp @@ -191,7 +191,7 @@ void SignatureDB::Initialize(PPCSymbolDB *symbol_db, const char *prefix) break; } // Checksum only uses opcode, not opcode data, because opcode data changes - // in all compilations, but opcodes dont! + // in all compilations, but opcodes don't! sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) ); sum = sum ^ (op | op2 | op3); } diff --git a/Source/Core/DiscIO/Src/CISOBlob.cpp b/Source/Core/DiscIO/Src/CISOBlob.cpp index 08525a9d16..c4b3c60143 100644 --- a/Source/Core/DiscIO/Src/CISOBlob.cpp +++ b/Source/Core/DiscIO/Src/CISOBlob.cpp @@ -59,7 +59,7 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) auto const bytes_to_read = std::min(m_block_size - data_offset, nbytes); if (block < CISO_MAP_SIZE && UNUSED_BLOCK_ID != m_ciso_map[block]) { - // calcualte the base address + // calculate the base address auto const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * m_block_size + data_offset; if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read))) diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index d7e291c68a..b469dedc9c 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -288,10 +288,10 @@ bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB ca File::IOFile f(outfile, "wb"); if (!f) - { - delete reader; + { + delete reader; return false; - } + } const CompressedBlobHeader &header = reader->GetHeader(); u8* buffer = new u8[header.block_size]; diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index ca6ff0b4ee..e3a51208b4 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -311,7 +311,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED (ev void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev) { - // Appply AR Code changes + // Apply AR Code changes for (size_t i = 0; i < indexList.size(); i++) { ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(indexList[i].uiIndex), indexList[i].index); diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index 3af0b6e81c..c8f7b63eb4 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -397,7 +397,7 @@ void CCodeWindow::OnChangeFont(wxCommandEvent& event) DebuggerFont = dialog.GetFontData().GetChosenFont(); } -// Toogle windows +// Toggle windows void CCodeWindow::OpenPages() { diff --git a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h index 9590384671..eac6734bc9 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Src/Debugger/DebuggerPanel.h @@ -79,7 +79,7 @@ private: void GeneralSettings(wxCommandEvent& event); - // These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occured) + // These set GFXDebuggerPauseFlag to true (either immediately or once the specified event has occurred) void OnPauseButton(wxCommandEvent& event); void OnPauseAtNextButton(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp index d0ac57e14d..fa85ce808e 100644 --- a/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/MemoryWindow.cpp @@ -66,7 +66,7 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, { wxBoxSizer* sizerBig = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizerRight = new wxBoxSizer(wxVERTICAL); - // Didn't see anything usefull in the left part + // Didn't see anything useful in the left part //wxBoxSizer* sizerLeft = new wxBoxSizer(wxVERTICAL); DebugInterface* di = &PowerPC::debug_interface; diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index b07a1286b3..2ed76f6214 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -43,7 +43,7 @@ extern "C" { #ifdef _WIN32 -// I could not use FindItemByHWND() instead of this, it crashed on that occation I used it */ +// I could not use FindItemByHWND() instead of this, it crashed on that occasion I used it */ HWND MSWGetParent_(HWND Parent) { return GetParent(Parent); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index d3e66d8059..a3c6fbe59a 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -988,7 +988,7 @@ void CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& event) } else { - // Othwerise blank the value and save it + // Otherwise blank the value and save it SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = ""; SConfig::GetInstance().SaveSettings(); } diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index d7c8cb7da7..9f96956abc 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -207,7 +207,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) case 0 : { std::istringstream ssline(line); - // stop at [ character (begining of contributer name) + // stop at [ character (beginning of contributor name) std::getline(ssline, gcode.name, '['); gcode.name = StripSpaces(gcode.name); // read the code creator name diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 944e4a65a2..a763fad3fc 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -67,7 +67,7 @@ GameListItem::GameListItem(const std::string& _rFileName) m_IsDiscTwo = pVolume->IsDiscTwo(); m_Revision = pVolume->GetRevision(); - // check if we can get some infos from the banner file too + // check if we can get some info from the banner file too DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); if (pFileSystem != NULL || m_Platform == WII_WAD) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 119ef519cb..3b2a79748d 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1347,7 +1347,7 @@ void CISOProperties::ChangeBannerDetails(int lang) wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(lang)); wxString const maker = StrToWxStr(OpenGameListItem->GetCompany()); - // Updates the informations shown in the window + // Updates the information shown in the window m_ShortName->SetValue(shortName); m_Comment->SetValue(comment); m_Maker->SetValue(maker);//dev too diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index fb26073513..8ad34bed08 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -126,7 +126,7 @@ wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copi wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, an error message is displayed.\nHowever, one may skip the popups to allow interruption free gameplay by checking this option.\n\nIf unsure, leave this unchecked."); -// Search for avaliable resolutions - TODO: Move to Common? +// Search for available resolutions - TODO: Move to Common? wxArrayString GetListOfResolutions() { wxArrayString retlist; diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index 475718ed2e..f039fe4938 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -23,7 +23,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin const wxString src_choices[] = { _("None"), _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") }; - // reserve four ids, so that we can calculate the index from the ids lateron + // reserve four ids, so that we can calculate the index from the ids later on // Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated.. int source_ctrl_id = wxWindow::NewControlId(); m_wiimote_index_from_ctrl_id.insert(std::pair(source_ctrl_id, i)); diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h index cf9efcf44c..33057434cd 100644 --- a/Source/Core/InputCommon/Src/ControllerEmu.h +++ b/Source/Core/InputCommon/Src/ControllerEmu.h @@ -140,7 +140,7 @@ public: // deadzone / square stick code if (deadzone || square) { - // this section might be all wrong, but its working good enough, i think + // this section might be all wrong, but its working good enough, I think ControlState ang = atan2(yy, xx); ControlState ang_sin = sin(ang); @@ -150,7 +150,7 @@ public: ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2); // the amt a full stick would have that was ( user setting squareness) at current angle - // i think this is more like a pointed circle rather than a rounded square like it should be + // I think this is more like a pointed circle rather than a rounded square like it should be ControlState stick_full = (1 + (square_full - 1) * square); ControlState dist = sqrt(xx*xx + yy*yy); @@ -312,7 +312,7 @@ public: // deadzone / circle stick code if (deadzone || circle) { - // this section might be all wrong, but its working good enough, i think + // this section might be all wrong, but its working good enough, I think ControlState ang = atan2(yy, xx); ControlState ang_sin = sin(ang); @@ -322,7 +322,7 @@ public: ControlState square_full = std::min(ang_sin ? 1/fabsf(ang_sin) : 2, ang_cos ? 1/fabsf(ang_cos) : 2); // the amt a full stick would have that was (user setting circular) at current angle - // i think this is more like a pointed circle rather than a rounded square like it should be + // I think this is more like a pointed circle rather than a rounded square like it should be ControlState stick_full = (square_full * (1 - circle)) + (circle); ControlState dist = sqrt(xx*xx + yy*yy); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 59bc49ac51..8c1a044860 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -33,13 +33,13 @@ #define CIFACE_USE_ANDROID #endif -// idk in case i wanted to change it to double or somethin, idk what's best +// idk in case I wanted to change it to double or something, idk what's best typedef float ControlState; // // ControllerInterface // -// some crazy shit i made to control different device inputs and outputs +// some crazy shit I made to control different device inputs and outputs // from lots of different sources, hopefully more easily // class ControllerInterface @@ -189,7 +189,7 @@ public: // // these are what you create to actually use the inputs, InputReference or OutputReference // - // after being binded to devices and controls with ControllerInterface::UpdateReference, + // after being bound to devices and controls with ControllerInterface::UpdateReference, // each one can link to multiple devices and controls // when you change a ControlReference's expression, // you must use ControllerInterface::UpdateReference on it to rebind controls diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index ed5d1383ec..916d142149 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -22,13 +22,13 @@ static const struct } force_type_names[] = { {GUID_ConstantForce, "Constant"}, // DICONSTANTFORCE - {GUID_RampForce, "Ramp"}, // DIRAMPFORCE - {GUID_Square, "Square"}, // DIPERIODIC ... + {GUID_RampForce, "Ramp"}, // DIRAMPFORCE + {GUID_Square, "Square"}, // DIPERIODIC ... {GUID_Sine, "Sine"}, {GUID_Triangle, "Triangle"}, {GUID_SawtoothUp, "Sawtooth Up"}, {GUID_SawtoothDown, "Sawtooth Down"}, - //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < i think + //{GUID_Spring, "Spring"}, // DICUSTOMFORCE ... < I think //{GUID_Damper, "Damper"}, //{GUID_Inertia, "Inertia"}, //{GUID_Friction, "Friction"}, @@ -70,9 +70,9 @@ void GetXInputGUIDS( std::vector& guids ) if( FAILED(hr) || pIWbemLocator == NULL ) goto LCleanup; - bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup; - bstrClassName = SysAllocString( L"Win32_PNPEntity" ); if( bstrClassName == NULL ) goto LCleanup; - bstrDeviceID = SysAllocString( L"DeviceID" ); if( bstrDeviceID == NULL ) goto LCleanup; + bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup; + bstrClassName = SysAllocString( L"Win32_PNPEntity" ); if( bstrClassName == NULL ) goto LCleanup; + bstrDeviceID = SysAllocString( L"DeviceID" ); if( bstrDeviceID == NULL ) goto LCleanup; // Connect to WMI hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices ); @@ -81,7 +81,7 @@ void GetXInputGUIDS( std::vector& guids ) // Switch security level to IMPERSONATE. CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, - RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); if( FAILED(hr) || pEnumDevices == NULL ) @@ -184,7 +184,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vectortszInstanceName]++); - // only add if it has some inputs/outpus + // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) devices.push_back(js); else @@ -196,7 +196,6 @@ void InitJoystick(IDirectInput8* const idi8, std::vectorRelease(); } } - } } @@ -226,7 +225,7 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI if (FAILED(m_device->GetCapabilities(&js_caps))) return; - // max of 32 buttons and 4 hats / the limit of the data format i am using + // max of 32 buttons and 4 hats / the limit of the data format I am using js_caps.dwButtons = std::min((DWORD)32, js_caps.dwButtons); js_caps.dwPOVs = std::min((DWORD)4, js_caps.dwPOVs); @@ -258,9 +257,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI range.lMin = -(1 << 7); range.lMax = (1 << 7); m_device->SetProperty(DIPROP_RANGE, &range.diph); - // but i guess not all devices support setting range - // so i getproperty right afterward incase it didn't set :P - // this also checks that the axis is present + // but I guess not all devices support setting range + // so I getproperty right afterward incase it didn't set. + // This also checks that the axis is present if (SUCCEEDED(m_device->GetProperty(DIPROP_RANGE, &range.diph))) { const LONG base = (range.lMin + range.lMax) / 2; @@ -404,7 +403,7 @@ bool Joystick::UpdateInput() HRESULT hr = 0; // just always poll, - // msdn says if this isn't needed it doesnt do anything + // MSDN says if this isn't needed it doesn't do anything m_device->Poll(); if (m_buffered) @@ -539,7 +538,7 @@ ControlState Joystick::Button::GetState() const ControlState Joystick::Hat::GetState() const { // can this func be simplified ? - // hat centered code from msdn + // hat centered code from MSDN if (0xFFFF == LOWORD(m_hat)) return 0; return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 866bce9671..ea6452376d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -6,7 +6,7 @@ #include "DInput.h" // (lower would be more sensitive) user can lower sensitivity by setting range - // seems decent here ( at 8 ), I dont think anyone would need more sensitive than this + // seems decent here ( at 8 ), I don't think anyone would need more sensitive than this // and user can lower it much farther than they would want to with the range #define MOUSE_AXIS_SENSITIVITY 8 @@ -47,7 +47,7 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector FIFO_SIZE) { - PanicAlert("FIFO out of bounds (sz = %i, len = %i at %08x)", size, len, pos); + PanicAlert("FIFO out of bounds (size = %i, len = %i at %08x)", size, len, pos); } memmove(&videoBuffer[0], &videoBuffer[pos], size); g_pVideoData = videoBuffer; @@ -165,7 +165,7 @@ void RunGpuLoop() else readPtr += 32; _assert_msg_(COMMANDPROCESSOR, (s32)fifo.CPReadWriteDistance - 32 >= 0 , - "Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instabilty in the game. Please report it.", fifo.CPReadWriteDistance - 32); + "Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instability in the game. Please report it.", fifo.CPReadWriteDistance - 32); ReadDataFromFifo(uData, 32); diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h index 7c6865610e..3263d2c7b0 100644 --- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.h @@ -31,7 +31,7 @@ #define GX_DRAW_LINES 0x5 // 0xA8 #define GX_DRAW_LINE_STRIP 0x6 // 0xB0 #define GX_DRAW_POINTS 0x7 // 0xB8 -#define GX_DRAW_NONE 0x1; //Tis is a fake value to used in the backends +#define GX_DRAW_NONE 0x1; // This is a fake value to used in the backends extern bool g_bRecordFifoData; diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp index 87c56a1a1e..5819f64a83 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.cpp +++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp @@ -450,7 +450,7 @@ void SetFinish() void ResetSetFinish() { //if SetFinish happened but PE_CTRL_REGISTER not, I reset the interrupt else - //remove event from the queque + //remove event from the queue if (g_bSignalFinishInterrupt) { UpdateFinishInterrupt(false); diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp index 14fb01a384..9b7c981b17 100644 --- a/Source/Core/VideoCommon/Src/Statistics.cpp +++ b/Source/Core/VideoCommon/Src/Statistics.cpp @@ -33,8 +33,8 @@ void Statistics::SwapDL() char *Statistics::ToString(char *ptr) { char *p = ptr; - ptr+=sprintf(ptr,"textures created: %i\n",stats.numTexturesCreated); - ptr+=sprintf(ptr,"textures alive: %i\n",stats.numTexturesAlive); + ptr+=sprintf(ptr,"Textures created: %i\n",stats.numTexturesCreated); + ptr+=sprintf(ptr,"Textures alive: %i\n",stats.numTexturesAlive); ptr+=sprintf(ptr,"pshaders created: %i\n",stats.numPixelShadersCreated); ptr+=sprintf(ptr,"pshaders alive: %i\n",stats.numPixelShadersAlive); ptr+=sprintf(ptr,"pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders); @@ -43,12 +43,12 @@ char *Statistics::ToString(char *ptr) ptr+=sprintf(ptr,"dlists called: %i\n",stats.numDListsCalled); ptr+=sprintf(ptr,"dlists called(f): %i\n",stats.thisFrame.numDListsCalled); ptr+=sprintf(ptr,"dlists alive: %i\n",stats.numDListsAlive); - ptr+=sprintf(ptr,"primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins); - ptr+=sprintf(ptr,"draw calls: %i\n",stats.thisFrame.numDrawCalls); - ptr+=sprintf(ptr,"indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls); - ptr+=sprintf(ptr,"buffer splits: %i\n",stats.thisFrame.numBufferSplits); - ptr+=sprintf(ptr,"primitives: %i\n",stats.thisFrame.numPrims); - ptr+=sprintf(ptr,"primitives (DL): %i\n",stats.thisFrame.numDLPrims); + ptr+=sprintf(ptr,"Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins); + ptr+=sprintf(ptr,"Draw calls: %i\n",stats.thisFrame.numDrawCalls); + ptr+=sprintf(ptr,"Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls); + ptr+=sprintf(ptr,"Buffer splits: %i\n",stats.thisFrame.numBufferSplits); + ptr+=sprintf(ptr,"Primitives: %i\n",stats.thisFrame.numPrims); + ptr+=sprintf(ptr,"Primitives (DL): %i\n",stats.thisFrame.numDLPrims); ptr+=sprintf(ptr,"XF loads: %i\n",stats.thisFrame.numXFLoads); ptr+=sprintf(ptr,"XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL); ptr+=sprintf(ptr,"CP loads: %i\n",stats.thisFrame.numCPLoads); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 2ea35680b6..d1abe79245 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -382,7 +382,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, // TODO: Print a warning if the format changes! In this case, // we could reinterpret the internal texture object data to the new pixel format - // (similiar to what is already being done in Renderer::ReinterpretPixelFormat()) + // (similar to what is already being done in Renderer::ReinterpretPixelFormat()) return ReturnEntry(stage, entry); } diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index bb042ed332..38a36c3861 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -399,7 +399,7 @@ void VertexLoader::CompileVertexTranslator() } else { _assert_msg_(VIDEO, DIRECT <= tc[i] && tc[i] <= INDEX16, "Invalid texture coordinates!\n(tc[i] = %d)", tc[i]); _assert_msg_(VIDEO, FORMAT_UBYTE <= format && format <= FORMAT_FLOAT, "Invalid texture coordinates format!\n(format = %d)", format); - _assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elemnts!\n(elements = %d)", elements); + _assert_msg_(VIDEO, 0 <= elements && elements <= 1, "Invalid number of texture coordinates elements!\n(elements = %d)", elements); m_NativeFmt->m_components |= VB_HAS_UV0 << i; WriteCall(VertexLoader_TextCoord::GetFunction(tc[i], format, elements)); diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp index 27c6a0bce2..f11ebb193f 100644 --- a/Source/Core/VideoCommon/Src/x64DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -93,7 +93,7 @@ struct CachedDisplayList // Compile the commands themselves down to native code. const u8* compiled_code; u32 uncachable; // if set, this DL will always be interpreted. This gets set if hash ever changes. - // Analitic data + // Analytic data u32 num_xf_reg; u32 num_cp_reg; u32 num_bp_reg; diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp index 1c67ec4664..e12b62d5a7 100644 --- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp @@ -675,7 +675,7 @@ PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt) inline void SetOpenMPThreadCount(int width, int height) { #ifdef _OPENMP - // Dont use multithreading in small Textures + // Don't use multithreading in small Textures if (g_ActiveConfig.bOMPDecoder && width > 127 && height > 127) { // don't span to many threads they will kill the rest of the emu :) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index ebfe816b8a..eab4ff08c2 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -554,7 +554,7 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) (float)X, (float)Y, (float)Wd, (float)Ht); - // Some games set invalids values for z min and z max so fix them to the max an min alowed and let the shaders do this work + // Some games set invalid values for z-min and z-max so fix them to the max and min allowed and let the shaders do this work D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Wd, (float)Ht, 0.f, // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index a6024c7273..be13911fe9 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -126,7 +126,7 @@ Renderer::Renderer() IS_AMD = D3D::IsATIDevice(); - // Decide frambuffer size + // Decide framebuffer size s_backbuffer_width = D3D::GetBackBufferWidth(); s_backbuffer_height = D3D::GetBackBufferHeight(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 8e2e644e52..153fe748f1 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -517,7 +517,7 @@ void ProgramShaderCache::CreateHeader ( void ) , v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : "" , v==GLSL_120 ? "#define out " : "" , v==GLSL_120 ? "#define ocol0 gl_FragColor" : "" - , v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implemenet dual source blend + , v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend , v==GLSL_120 ? "" : "out vec4 name;" ); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index dd6c566e49..acc77d1f0e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -205,7 +205,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta continue; } - // do not print spaces, they can be skipped easyly + // do not print spaces, they can be skipped easily if(c == ' ') { x += delta_x + border_x; continue; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index ac42b0fc71..9ee11a9f85 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -293,7 +293,7 @@ Renderer::Renderer() if (!GLEW_ARB_framebuffer_object) { - ERROR_LOG(VIDEO, "GPU: ERROR: Need GL_ARB_framebufer_object for multiple render targets.\n" + ERROR_LOG(VIDEO, "GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -344,13 +344,13 @@ Renderer::Renderer() { ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need at least GLSL 1.20\n" "GPU: Does your video card support OpenGL 2.1?\n" - "GPU: Your driver supports glsl %s", g_ogl_config.glsl_version); + "GPU: Your driver supports GLSL %s", g_ogl_config.glsl_version); bSuccess = false; } else if(strstr(g_ogl_config.glsl_version, "1.20")) { g_ogl_config.eSupportedGLSLVersion = GLSL_120; - g_Config.backend_info.bSupportsDualSourceBlend = false; //TODO: implemenet dual source blend + g_Config.backend_info.bSupportsDualSourceBlend = false; //TODO: implement dual source blend } else if(strstr(g_ogl_config.glsl_version, "1.30")) { @@ -403,7 +403,7 @@ Renderer::Renderer() s_MSAACoverageSamples = GetNumMSAACoverageSamples(s_LastMultisampleMode); ApplySSAASettings(); - // Decide frambuffer size + // Decide framebuffer size s_backbuffer_width = (int)GLInterface->GetBackBufferWidth(); s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 04872aea22..6e1590c1c6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -37,7 +37,7 @@ extern NativeVertexFormat *g_nativeVertexFmt; namespace OGL { -//This are the initially requeted size for the buffers expresed in bytes +//This are the initially requested size for the buffers expressed in bytes const u32 MAX_IBUFFER_SIZE = 2*1024*1024; const u32 MAX_VBUFFER_SIZE = 16*1024*1024; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index d15838b9af..7c3408a316 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -129,7 +129,7 @@ void DecodeStandard(u32 bufferSize) // XXX: Investigate #ifndef ANDROID // check if switching in or out of an object - // only used for debuggging + // only used for debugging if (inObjectStream && (Cmd & 0x87) != lastPrimCmd) { inObjectStream = false; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index 92b89803e6..f1fc5f5ac9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -171,7 +171,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi) // tex coords for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++) { - // multiply by 128 because TEV stores stores UVs as s17.7 + // multiply by 128 because TEV stores UVs as s17.7 tev.Uv[i].s = (s32)(pixel.Uv[i][0] * 128); tev.Uv[i].t = (s32)(pixel.Uv[i][1] * 128); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp index 7aadcade77..5fd1353a94 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp @@ -259,12 +259,12 @@ void Write16(const u16 _Value, const u32 _Address) void Read32(u32& _rReturnValue, const u32 _Address) { _rReturnValue = 0; - _dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProccessor at 0x%08x", _Address); + _dbg_assert_msg_(COMMANDPROCESSOR, 0, "Read32 from CommandProcessor at 0x%08x", _Address); } void Write32(const u32 _Data, const u32 _Address) { - _dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProccessor at 0x%08x", _Address); + _dbg_assert_msg_(COMMANDPROCESSOR, 0, "Write32 at CommandProcessor at 0x%08x", _Address); } void STACKALIGN GatherPipeBursted() @@ -424,7 +424,7 @@ bool RunBuffer() bool ranDecoder = false; - // move data remaing in command buffer + // move data remaining in the command buffer if (readPos > 0) { memmove(&commandBuffer[0], &commandBuffer[readPos], availableBytes);