mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Fix references to the old font files
This commit is contained in:
@@ -32,8 +32,6 @@ enum {
|
|||||||
MAX_TEXT_HEIGHT = 512
|
MAX_TEXT_HEIGHT = 512
|
||||||
};
|
};
|
||||||
|
|
||||||
#define APPLE_FONT "RobotoCondensed-Regular"
|
|
||||||
|
|
||||||
// for future OpenEmu support
|
// for future OpenEmu support
|
||||||
#ifndef PPSSPP_FONT_BUNDLE
|
#ifndef PPSSPP_FONT_BUNDLE
|
||||||
#define PPSSPP_FONT_BUNDLE [NSBundle mainBundle]
|
#define PPSSPP_FONT_BUNDLE [NSBundle mainBundle]
|
||||||
|
|||||||
+2
-2
@@ -1862,9 +1862,9 @@ void EmuScreen::runImDebugger() {
|
|||||||
|
|
||||||
// Read the TTF font
|
// Read the TTF font
|
||||||
size_t propSize = 0;
|
size_t propSize = 0;
|
||||||
uint8_t *propFontData = g_VFS.ReadFile("Roboto-Condensed.ttf", &propSize);
|
const uint8_t *propFontData = g_VFS.ReadFile("Roboto_Condensed-Regular.ttf", &propSize);
|
||||||
size_t fixedSize = 0;
|
size_t fixedSize = 0;
|
||||||
uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Medium.ttf", &fixedSize);
|
const uint8_t *fixedFontData = g_VFS.ReadFile("Inconsolata-Regular.ttf", &fixedSize);
|
||||||
// This call works even if fontData is nullptr, in which case the font just won't get loaded.
|
// This call works even if fontData is nullptr, in which case the font just won't get loaded.
|
||||||
// This takes ownership of the font array.
|
// This takes ownership of the font array.
|
||||||
ImGui_ImplThin3d_Init(draw, propFontData, propSize, fixedFontData, fixedSize);
|
ImGui_ImplThin3d_Init(draw, propFontData, propSize, fixedFontData, fixedSize);
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ xcopy ..\assets\shaders assets\shaders\ /s /y <d.txt
|
|||||||
xcopy ..\assets\themes assets\themes\ /s /y <d.txt
|
xcopy ..\assets\themes assets\themes\ /s /y <d.txt
|
||||||
xcopy ..\assets\ui_images assets\ui_images\ /s /y <d.txt
|
xcopy ..\assets\ui_images assets\ui_images\ /s /y <d.txt
|
||||||
copy ..\assets\*.ini assets\
|
copy ..\assets\*.ini assets\
|
||||||
copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
|
copy ..\assets\*.ttf assets\
|
||||||
copy ..\assets\*.png assets\
|
copy ..\assets\*.png assets\
|
||||||
copy ..\assets\*.zim assets\
|
copy ..\assets\*.zim assets\
|
||||||
copy ..\assets\*.meta assets\
|
copy ..\assets\*.meta assets\
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@ cp -r ../assets/debugger assets/
|
|||||||
cp -r ../assets/upload assets/
|
cp -r ../assets/upload assets/
|
||||||
cp -r ../assets/ui_images assets/
|
cp -r ../assets/ui_images assets/
|
||||||
cp ../assets/*.ini assets/
|
cp ../assets/*.ini assets/
|
||||||
cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
|
cp ../assets/*.ttf assets/
|
||||||
cp ../assets/*.png assets/
|
cp ../assets/*.png assets/
|
||||||
cp ../assets/*.zim assets/
|
cp ../assets/*.zim assets/
|
||||||
cp ../assets/*.meta assets/
|
cp ../assets/*.meta assets/
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ cp ../assets/*.zim assets/
|
|||||||
cp ../assets/*.meta assets/
|
cp ../assets/*.meta assets/
|
||||||
cp ../assets/*.wav assets/
|
cp ../assets/*.wav assets/
|
||||||
cp ../assets/*.ini assets/
|
cp ../assets/*.ini assets/
|
||||||
cp ../assets/Roboto-Condensed.ttf assets/
|
cp ../assets/*.ttf assets/
|
||||||
cp -r ../assets/flash0 assets/
|
cp -r ../assets/flash0 assets/
|
||||||
cp -r ../assets/lang assets/
|
cp -r ../assets/lang assets/
|
||||||
cp -r ../assets/ui_images assets/
|
cp -r ../assets/ui_images assets/
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
2048
|
2048
|
||||||
font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
|
font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
|
||||||
|
|||||||
@@ -191,7 +191,6 @@ Refresh interval = Aktualisierungsintervall
|
|||||||
Auto Max Quality = Autom. Max. &Qualität
|
Auto Max Quality = Autom. Max. &Qualität
|
||||||
Buy PPSSPP Gold = Goldversion kaufen
|
Buy PPSSPP Gold = Goldversion kaufen
|
||||||
Copy PSP memory base address = PSP-Speicherplatz und -Adresse kopieren
|
Copy PSP memory base address = PSP-Speicherplatz und -Adresse kopieren
|
||||||
Font = Roboto Condensed
|
|
||||||
About PPSSPP... = Über PPSSPP...
|
About PPSSPP... = Über PPSSPP...
|
||||||
Auto = Autom.
|
Auto = Autom.
|
||||||
Backend = Grafik-Backend
|
Backend = Grafik-Backend
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
2048
|
2048
|
||||||
font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2
|
font UBUNTU24 assets/Roboto_Condensed-Regular.ttf UWERS 34 -2
|
||||||
font UBUNTU24 C:/dev/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0
|
font UBUNTU24 C:/dev/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<customFonts key="customFonts">
|
<customFonts key="customFonts">
|
||||||
<array key="Roboto-Condensed.ttf">
|
<array key="Roboto_Condensed-Regular.ttf">
|
||||||
<string>Roboto-Condensed</string>
|
<string>Roboto_Condensed-Regular</string>
|
||||||
</array>
|
</array>
|
||||||
</customFonts>
|
</customFonts>
|
||||||
<scenes>
|
<scenes>
|
||||||
|
|||||||
Reference in New Issue
Block a user