diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index cb602150f9..9e816ba8b6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -509,7 +509,7 @@ int cellFontBindRenderer(mem_ptr_t font, mem_ptr_t r cellFont.Warning("cellFontBindRenderer(font_addr=0x%x, renderer_addr=0x%x)", font.GetAddr(), renderer.GetAddr()); - if (!font.IsGood() || !renderer.GetAddr()) + if (!font.IsGood() || !renderer.IsGood()) return CELL_FONT_ERROR_INVALID_PARAMETER; if (font->renderer_addr) return CELL_FONT_ERROR_RENDERER_ALREADY_BIND; @@ -592,11 +592,11 @@ int cellFontRenderCharGlyphImage(mem_ptr_t font, u32 code, mem_ptr_tbuffer_addr); - for (u32 ypos = 0; ypos < height; ypos++){ + for (u32 ypos = 0; ypos < (u32)height; ypos++){ if ((u32)y + ypos + yoff + baseLineY >= surface->height) break; - for (u32 xpos = 0; xpos < width; xpos++){ + for (u32 xpos = 0; xpos < (u32)width; xpos++){ if ((u32)x + xpos >= surface->width) break; diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 24c8971206..a9fbde25a2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -609,9 +609,9 @@ int cellRescGetBufferSize(mem32_t colorBuffers, mem32_t vertexArray, mem32_t fra fragmentUcodeSize = 0x300; } - if(colorBuffers.GetAddr()) colorBuffers = colorBuffersSize; - if(vertexArray.GetAddr()) vertexArray = vertexArraySize; - if(fragmentShader.GetAddr()) fragmentShader = fragmentUcodeSize; + if(colorBuffers.IsGood()) colorBuffers = colorBuffersSize; + if(vertexArray.IsGood()) vertexArray = vertexArraySize; + if(fragmentShader.IsGood()) fragmentShader = fragmentUcodeSize; return CELL_OK; } @@ -725,7 +725,7 @@ int cellRescSetBufferAddress(mem32_t colorBuffers, mem32_t vertexArray, mem32_t if(!s_rescInternalInstance->m_bInitialized) return CELL_RESC_ERROR_NOT_INITIALIZED; - if(!colorBuffers.GetAddr() || !vertexArray.GetAddr() || !fragmentShader.GetAddr()) + if(!colorBuffers.IsGood() || !vertexArray.IsGood() || !fragmentShader.IsGood()) return CELL_RESC_ERROR_BAD_ARGUMENT; if(colorBuffers.GetAddr() % COLOR_BUFFER_ALIGNMENT || vertexArray.GetAddr() % VERTEX_BUFFER_ALIGNMENT ||