archives/DinkSmallwoodHD
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Timing fixes, some Android work

Browse source 
git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1515 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-09-29 22:57:00 +00:00
parent 4174db5427
commit 63adc575a8
11 changed files with 135 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/GUI/DMODMenu.cpp
View file

@ -463,7 +463,7 @@ void DMODMenuAddScrollContent(Entity *pParent)
|| EndsWith(entries[i].m_files, "/develop")
)continue;
#else
if (IsInString(files[i],"/Snapshot") || IsInString(files[i], "/Snapshots")) continue;
if (IsInString(entries[i].m_files,"/Snapshot") || IsInString(entries[i].m_files, "/Snapshots")) continue;
#endif
GetParsedDMODInfo(entries[i].m_files, entries[i].dmodName, entries[i].version, entries[i].dmodCopyright, entries[i].dmodwebsite, entries[i].description );

8
source/GUI/GameMenu.cpp
View file

@ -1035,9 +1035,6 @@ void OnGameMenuRender(VariantList *pVList)
//apply scale offset
ApplyAspectRatioGLMatrix();
updateFrame();
if (DinkGetSpeedUpMode())
@ -1045,7 +1042,7 @@ void OnGameMenuRender(VariantList *pVList)
//3x speed
for (int i = 0; i < 2; i++)
{
GetApp()->SetGameTick(GetApp()->GetGameTick() + GetApp()->GetDeltaTick() * 3);
//GetApp()->SetGameTick(GetApp()->GetGameTick() + GetApp()->GetDeltaTick() * 3);
//GetApp()->GetGameTimer()->Update();
glClearColor(0, 0, 0, 1);
@ -1054,6 +1051,9 @@ void OnGameMenuRender(VariantList *pVList)
}
}
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
//remove matrix

5
source/GUI/OptionsMenu.cpp
View file

@ -482,7 +482,7 @@ void OptionsMenuAddScrollContent(Entity *pParent)
y += GetSize2DEntity(pEnt).y;
y += spacerY;
/*
//fps limit
pEnt = CreateTextLabelEntity(pBG, "", startX, y, "Lock to 30 FPS:");
SetupTextEntity(pEnt,fontID);
@ -499,7 +499,8 @@ void OptionsMenuAddScrollContent(Entity *pParent)
uint32 videoFPS = GetApp()->GetVar("fpsLimit")->GetUINT32();
SetupLightBarSelect(pBG, "fps_limit_", videoFPS, MAKE_RGBA(190, 0, 35, 255));
*/
if (GetPlatformID() != PLATFORM_ID_IOS)
{
y += spacerY;