mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-06 02:14:08 +00:00
Merge branch 'miami' into lcs
# Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
This commit is contained in:
commit
9647901ba0
58 changed files with 565 additions and 267 deletions
|
@ -1000,7 +1000,9 @@ CMenuManager::DrawStandardMenus(bool activeScreen)
|
|||
}
|
||||
|
||||
wchar unicodeTemp[64];
|
||||
#ifdef ASPECT_RATIO_SCALE
|
||||
char asciiTemp[32];
|
||||
#endif
|
||||
|
||||
bool weHaveLabel = aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL;
|
||||
uint8 section = 0; // 0: highlight trapezoid 1: texts
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue