summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2013-01-28 22:00:47 +1300
committerMatthew Parlane <parlane@gmail.com>2013-01-28 22:00:47 +1300
commit2dd077028fdaa296827864e70252b4e992b26c65 (patch)
tree6a65b5dc0c1566239f603bf1590a2eace73b46e6 /Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
parented9ef874e581aa2ff5c47ec58e7b741e160b026e (diff)
parenta8d4c78cec87e864cfa5410f14687d13308e38d7 (diff)
Merge branch 'master' into wii-network
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
index 6a17a40eb1..f05f9f8b57 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
@@ -135,10 +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)
{
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);