mirror of
https://github.com/GTAmodding/re3.git
synced 2025-10-14 23:20:34 +00:00
Merge branch 'master' into miami
# Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
This commit is contained in:
commit
35c41208f5
15 changed files with 31 additions and 11 deletions
|
@ -13,6 +13,7 @@ RtCharset *debugCharset;
|
|||
|
||||
bool gPS2alphaTest = 1;
|
||||
|
||||
#ifndef FINAL
|
||||
static bool charsetOpen;
|
||||
void OpenCharsetSafe()
|
||||
{
|
||||
|
@ -20,6 +21,7 @@ void OpenCharsetSafe()
|
|||
RtCharsetOpen();
|
||||
charsetOpen = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
void CreateDebugFont()
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue