mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-12-12 13:21:51 +00:00
2b51e8d5dd
For the Doom IWADs the provided font looks almost identical to the characters used on the title patches. So, for any level name that got replaced in some language, it will now check if the retrieved name comes from the default table, and if not, ignore the title patch and print the name with the specified font. This also required removing the 'en' label from the default table, because with this present, the text would always be picked from 'en' instead of 'default'. Since 'en' and 'default' had the same contents, in any English locale the 'default' table was never hit, so this won't make any difference for the texts being chosen. Last but not least, wminfo has been made a local variable in G_DoCompleted. There were two places where this was accessed from outside the summary screen or its setup code, and both were incorrect. # Conflicts: # src/g_hub.cpp # src/g_level.cpp # src/gamedata/g_mapinfo.h # src/gi.h # src/p_setup.cpp # src/stringtable.cpp # src/stringtable.h # wadsrc/static/zscript/ui/statscreen/statscreen.zs # wadsrc_extra/static/iwadinfo.txt # Conflicts: # src/gi.h # wadsrc_extra/static/iwadinfo.txt |
||
|---|---|---|
| .. | ||
| statscreen.zs | ||
| statscreen_coop.zs | ||
| statscreen_dm.zs | ||
| statscreen_sp.zs | ||
| types.zs | ||