Duplicate condition fix.

Thanks j4ck.fr0st
dolphin-emu · Jan 26, 2013 · efe8c75 · efe8c75
1 parent 1e006b5
commit efe8c75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -519,9 +519,8 @@ void BPWritten(const BPCmd& bp)
 
 				for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
 				{
-					// FIXME: Duplicate conditions.
 					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
-						tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE)
+						tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
 						break;
 
 					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
@@ -135,11 +135,10 @@ void SWBPWritten(int address, int newvalue)
 				// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
 				u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
 
-				for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
+				for (unsigned int i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
 				{
-					// FIXME: Duplicate conditions
 					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
-						tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE)
+						tmem_addr_odd  + TMEM_LINE_SIZE > TMEM_SIZE)
 						break;
 
 					memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);