Merge pull request #28 from Poliwrath/clean

Very small cleanup

.gitignore

@@ -18,3 +18,4 @@ TeknoParrot/TeknoParrot\.vcxproj\.user
 ParrotLoader/ParrotLoader\.vcxproj\.user
 
 *.user
+*.aps

OpenParrot/premake5.lua

@@ -7,7 +7,7 @@ project "OpenParrot"
 	{
 		"src/**.cpp", "src/**.h",
 		"deps/cpp/**.cpp", "deps/inc/**.h",
-		"src/OpenParrot.aps", "src/OpenParrot.rc"
+	    "src/OpenParrot.rc"
 	}
 
 	includedirs { "src", "deps/inc/" }

OpenParrot/src/Functions/Global.cpp

@@ -40,16 +40,13 @@ DWORD WINAPI QuitGameThread(__in  LPVOID lpParameter)
 {
 	while (true)
 	{
-		if ((GameDetect::currentGame == GameID::Daytona3) && (GetAsyncKeyState(VK_ESCAPE)))
+		if (GetAsyncKeyState(VK_ESCAPE))
 		{
 #ifndef _DEBUG
+			if (GameDetect::currentGame == GameID::Daytona3)
+			{
 				system("taskkill /f /im InpWrapper.exe");
-			TerminateProcess(GetCurrentProcess(), 0);
-#endif
 			}
-		else if (GetAsyncKeyState(VK_ESCAPE))
-		{
-#ifndef _DEBUG
 			TerminateProcess(GetCurrentProcess(), 0);
 #endif
 			//ExitProcess(0);

OpenParrot/src/Functions/Nesica_Libs/FastIoEmu.cpp

@@ -53,7 +53,7 @@ int __cdecl iDmacDrvRegisterRead(int DeviceId, DWORD CommandCode, LPVOID OutBuff
 		result = 0x00FF00FF;
 		break;
 	case 0x4004:
-		if(GameDetect::currentGame == GameID::DariusBurst)
+		if (GameDetect::currentGame == GameID::DariusBurst)
 		{
 			// I/O error without this switch
 			result = 0x00FF00FF;

OpenParrot/src/Functions/Nesica_Libs/NesysEmu.cpp

@@ -481,11 +481,7 @@ void NesysEmu::Initialize(bool isDarius)
 	{
 		while (true)
 		{
-			HANDLE pipe;
+			HANDLE pipe = CreateNamedPipeW(isDarius ? L"\\\\.\\pipe\\nesystest" : L"\\\\.\\pipe\\nesys_games", PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 8192, 8192, 0, nullptr);
-			if(!isDarius)
-				pipe = CreateNamedPipeW(L"\\\\.\\pipe\\nesys_games", PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 8192, 8192, 0, nullptr);
-			else
-				pipe = CreateNamedPipeW(L"\\\\.\\pipe\\nesystest", PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 8192, 8192, 0, nullptr);
 
 			if (pipe == INVALID_HANDLE_VALUE)
 			{

OpenParrot/src/Functions/Nesica_Libs/RfidEmu.cpp

@@ -144,10 +144,10 @@ public:
 		for (DWORD i = sizeaddr; i<xpos; i++)
 			if (buffer[i] != 0xD0)
 				++sizeK;
-		// codifica o tamanho da stream
+		// encode the size of the stream
 		buffer[sizeaddr] = sizeK;
 
-		// calcula o checksum
+		// calculate the checksum
 		DWORD sum = 0;
 		for (DWORD i = sumaddr, inc = 0; i<xpos; i++) {
 			if (buffer[i] == 0xD0) {

OpenParrot/src/Functions/XInputEmu.cpp

@@ -2,7 +2,7 @@
 #include "StdInc.h"
 #include "Utility/GameDetect.h"
 #include "Utility/InitFunction.h"
-#include "PokkenXInputEmu.h"
+#include "XInputEmu.h"
 
 struct XboxOneControllerHandler
 {
@@ -81,9 +81,6 @@ DWORD WINAPI XInputGetState
 		if (GameDetect::currentGame == GameID::Daytona3)
 		{
 			gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00;
-		}
-		if (GameDetect::currentGame == GameID::Daytona3)
-		{
 			gamepadState.sThumbLX |= (-(33024 - *ffbOffset2) * 255);
 		}
 #endif
@@ -289,9 +286,6 @@ DWORD WINAPI XInputGetStateEx
 		if (GameDetect::currentGame == GameID::Daytona3)
 		{
 			gamepadState.bRightTrigger = daytonaPressStart ? 0xFF : 0x00;
-		}
-		if (GameDetect::currentGame == GameID::Daytona3)
-		{
 			gamepadState.sThumbLX |= (-(33024 - *ffbOffset2) * 255);
 		}
 #endif