Code cleanup.

Rinnegatamante · Aug 26, 2020 · 58a0fb4 · 58a0fb4
1 parent 8eed336
commit 58a0fb4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 36 deletions.
diff --git a/Source/Core/Cheats.cpp b/Source/Core/Cheats.cpp
@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define CHEAT_CODE_MAGIC_VALUE 0xDEAD
 
 CODEGROUP *codegrouplist;
-u32		codegroupcount		{};
+u32	codegroupcount = 0;
 //*****************************************************************************
 //
 //*****************************************************************************
@@ -84,10 +84,10 @@ void CheatCodes_Apply(u32 index, u32 mode)
 			code++;
 			continue;
 		}
-		u32 address {(code->addr & 0xFFFFFF)};
-		u16 value	{code->val};
-		u32 type	{(code->addr >> 24) & 0xFF};
-		u8* p_mem	{g_pu8RamBase + address}; // addr is already pre-swapped
+		u32 address = (code->addr & 0xFFFFFF);
+		u16 value	= code->val;
+		u32 type	= (code->addr >> 24) & 0xFF;
+		u8* p_mem	= g_pu8RamBase + address; // addr is already pre-swapped
 
 		switch(type)
 		{
@@ -196,7 +196,7 @@ void CheatCodes_Apply(u32 index, u32 mode)
 //*****************************************************************************
 void CheatCodes_Activate( CHEAT_MODE mode )
 {
-	for(u32 i {}; i < codegroupcount; i++)
+	for(u32 i = 0; i < codegroupcount; i++)
 	{
 		// Apply only activated cheats
 		if(codegrouplist[i].active)
@@ -405,7 +405,7 @@ bool CheatCodes_Read(const char *rom_name, const char *file, u8 countryID)
 				codegrouplist[codegroupcount].note[0] = '\0';
 			}
 
-			u32 addr {}, value {};
+			u32 addr = 0, value = 0;
 			codegrouplist[codegroupcount].active = (line[c1 + 1] - '0') ? true : false;
 			codegrouplist[codegroupcount].enable = false;
 			codegrouplist[codegroupcount].codecount = 0;
@@ -471,11 +471,6 @@ bool CheatCodes_Read(const char *rom_name, const char *file, u8 countryID)
 			codegroupcount++;
 		}
 	}
-	else
-	{
-		// Cannot find entry for the current rom
-		//printf("Cannot find entry %d groups of cheat code->n", codegroupcount);
-	}
 
 	fclose(stream);
 	return true;

diff --git a/Source/Core/Dynamo.cpp b/Source/Core/Dynamo.cpp
@@ -49,25 +49,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // These values are very sensitive to change in some games so be carefull!!! //Corn
 // War God is sensitive to gHotTraceThreshold
 // PD is sensitive to gMaxHotTraceMapSize
-//
-// Banjo Tooie needs a larger cache size
-// BUT leave PSP cache size untouched for now
-#ifdef DAEDALUS_PSP
-#define TRACE_SIZE 512
-#else
 #define TRACE_SIZE 1024
-#endif
 
-static const u32					gMaxFragmentCacheSize {(8192 + 1024)}; //Maximum amount of fragments in the cache
-static const u32					gMaxHotTraceMapSize {(2048 + TRACE_SIZE)};
-static const u32					gHotTraceThreshold {10};	//How many times interpreter has to loop a trace before it becomes hot and sent to dynarec
+static const u32					gMaxFragmentCacheSize = (8192 + 1024); //Maximum amount of fragments in the cache
+static const u32					gMaxHotTraceMapSize = (2048 + TRACE_SIZE);
+static const u32					gHotTraceThreshold = 10;	//How many times interpreter has to loop a trace before it becomes hot and sent to dynarec
 
 //typedef CMemoryPoolAllocator< std::pair< const u32, u32 > > MyAllocator;
 //std::map< u32, u32, std::less<u32>, MyAllocator >				gHotTraceCountMap;
 //std::map< u32, u32, std::less<u32>, boost::pool_allocator<std::pair< const u32, u32 > > >				gHotTraceCountMap;
 std::map< u32, u32 >				gHotTraceCountMap {};
 CFragmentCache						gFragmentCache {};
-static bool							gResetFragmentCache {false};
+static bool							gResetFragmentCache = false;
 
 #ifdef DAEDALUS_DEBUG_DYNAREC
 std::map< u32, u32 >				gAbortedTraceReasons;

diff --git a/Source/OSHLE/patch_gu_hle.inl b/Source/OSHLE/patch_gu_hle.inl
@@ -1,27 +1,27 @@
 //Fixed point identity matrix
 static const u32 s_IdentMatrixL[16] =
 {
-	0x00010000,	0x00000000,
-	0x00000001,	0x00000000,
-	0x00000000,	0x00010000,
-	0x00000000,	0x00000001,
+	0x00010000, 0x00000000,
+	0x00000001, 0x00000000,
+	0x00000000, 0x00010000,
+	0x00000000, 0x00000001,
 	0x00000000, 0x00000000,
-	0x00000000,	0x00000000,
 	0x00000000, 0x00000000,
-	0x00000000,	0x00000000
+	0x00000000, 0x00000000,
+	0x00000000, 0x00000000
 };
 
 //Floating point identity matrix
 static const u32 s_IdentMatrixF[16] =
 {
-	0x3f800000,	0x00000000,
-	0x00000000,	0x00000000,
-	0x00000000,	0x3f800000,
-	0x00000000,	0x00000000,
+	0x3f800000, 0x00000000,
+	0x00000000, 0x00000000,
+	0x00000000, 0x3f800000,
+	0x00000000, 0x00000000,
 	0x00000000, 0x00000000,
-	0x3f800000,	0x00000000,
+	0x3f800000, 0x00000000,
 	0x00000000, 0x00000000,
-	0x00000000,	0x3f800000
+	0x00000000, 0x3f800000
 };
 
 u32 Patch_guMtxIdentF()

diff --git a/Source/SysVita/UI/MainMenuScreen.cpp b/Source/SysVita/UI/MainMenuScreen.cpp
@@ -758,7 +758,7 @@ char *DrawRomSelector(bool skip_reloads) {
 	if (selected && !skip_reloads) {
 		cur_playtime = hovered->playtime;
 		last_launched = hovered;
-		CheatCodes_Read( hovered->title, "Daedalus.cht", hovered->id.CountryID );
+		CheatCodes_Read(hovered->title, "Daedalus.cht", hovered->id.CountryID);
 		return selectedRom;
 	}
 	return nullptr;