mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-23 01:57:21 +03:00
Merge gles1 and master
# Conflicts: # TODO.md # group/bld.inf # group/common.mmh # src/skel/symbian/symbian.cpp
This commit is contained in:
commit
55aecc66f3
82 changed files with 4082 additions and 129 deletions
|
|
@ -1140,6 +1140,8 @@ DisplayGameDebugText()
|
|||
"D3D8 "
|
||||
#elif defined RW_GL3
|
||||
"OpenGL "
|
||||
#elif defined RW_GLES1
|
||||
"GLES1 "
|
||||
#endif
|
||||
#if defined AUDIO_OAL
|
||||
"OAL "
|
||||
|
|
@ -1633,7 +1635,7 @@ Idle(void *arg)
|
|||
if((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu) &&
|
||||
TheCamera.GetScreenFadeStatus() != FADE_2)
|
||||
{
|
||||
#if defined(GTA_PC) && !defined(RW_GL3) && defined(FIX_BUGS)
|
||||
#if defined(GTA_PC) && !defined(RW_GL3) && !defined(RW_GLES1) && defined(FIX_BUGS)
|
||||
// This is from SA, but it's nice for windowed mode
|
||||
if (!FrontEndMenuManager.m_bRenderGameInMenu) {
|
||||
RwV2d pos;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue