From fdd2879443ac91a534833ad4b14076417126ffe7 Mon Sep 17 00:00:00 2001 From: TMaul Date: Mon, 17 Dec 2012 21:21:09 +0000 Subject: [PATCH 1/2] Another font function Used by assassins creed. --- Core/HLE/sceFont.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index dc1e6ffa82..adbf1145a9 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -318,6 +318,22 @@ int sceFontGetCharGlyphImage_Clip(u32 libHandler, u32 charCode, u32 glyphImagePt return 0; } + int sceFontGetFontList(u32 fontLibHandle, u32 fontStylePtr, u32 numFonts) + { + ERROR_LOG(HLE, "sceFontGetFontList %x, %x, %x", fontLibHandle, fontStylePtr, numFonts); + + FontStyle style; + memset(&style, 0, sizeof (style)); + + style.fontH = 20 / 64.f; + style.fontV = 20 / 64.f; + style.fontHRes = 20 / 64.f; + style.fontVRes = 20 / 64.f; + style.fontStyle = 1; + + Memory::WriteStruct(fontStylePtr, &style); + return 0; + } const HLEFunction sceLibFont[] = { @@ -325,7 +341,7 @@ const HLEFunction sceLibFont[] = {0x574b6fbc, WrapI_U, "sceFontDoneLib"}, {0x48293280, 0, "sceFontSetResolution"}, {0x27f6e642, WrapI_UU, "sceFontGetNumFontList"}, - {0xbc75d85b, 0, "sceFontGetFontList"}, + {0xbc75d85b, WrapI_UUU, "sceFontGetFontList"}, {0x099ef33c, WrapI_UUU, "sceFontFindOptimumFont"}, {0x681e61a7, WrapI_UUU, "sceFontFindFont"}, {0x2f67356a, 0, "sceFontCalcMemorySize"}, From 9a83dee9b5e7eef29310f4e6e707a34438c103d4 Mon Sep 17 00:00:00 2001 From: TMaul Date: Mon, 17 Dec 2012 23:57:40 +0000 Subject: [PATCH 2/2] With not insane tabs this time.. --- Core/HLE/sceFont.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index adbf1145a9..664a6699d5 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -318,12 +318,12 @@ int sceFontGetCharGlyphImage_Clip(u32 libHandler, u32 charCode, u32 glyphImagePt return 0; } - int sceFontGetFontList(u32 fontLibHandle, u32 fontStylePtr, u32 numFonts) - { - ERROR_LOG(HLE, "sceFontGetFontList %x, %x, %x", fontLibHandle, fontStylePtr, numFonts); - - FontStyle style; - memset(&style, 0, sizeof (style)); +int sceFontGetFontList(u32 fontLibHandle, u32 fontStylePtr, u32 numFonts) +{ + ERROR_LOG(HLE, "sceFontGetFontList %x, %x, %x", fontLibHandle, fontStylePtr, numFonts); + + FontStyle style; + memset(&style, 0, sizeof (style)); style.fontH = 20 / 64.f; style.fontV = 20 / 64.f; @@ -331,9 +331,9 @@ int sceFontGetCharGlyphImage_Clip(u32 libHandler, u32 charCode, u32 glyphImagePt style.fontVRes = 20 / 64.f; style.fontStyle = 1; - Memory::WriteStruct(fontStylePtr, &style); - return 0; - } + Memory::WriteStruct(fontStylePtr, &style); + return 0; +} const HLEFunction sceLibFont[] = {