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

* Escape now brings up the classic dink escape menu, the Dink HD menu was just too intrusive. It will show a text message that you can hit Shift-Escape to bring up the HD menu as well

Browse source 
* Made dialog box background look better by making it 32 bit with alpha, no more "cracks" at some resolutions.  Custom dialogs may still get line cracks at non 640X480 but whatever
* Default resolution is now 1024X768 fullscreen instead of 640X480
* dmod listing is packed tighter and now sorted alphabetically by dmod name, not directory name

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1509 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-09-26 12:41:23 +00:00
parent 45e7f2bd60
commit ac152e940e
9 changed files with 155 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

61
source/GUI/GameMenu.cpp
View file

@ -31,10 +31,10 @@ void ShowQuickMessage(string msg)
//assert(pMenu);
if (!pMenu)
{
// pMenu = GetEntityRoot();
// pMenu = GetEntityRoot();
return;
}
Entity *pEnt = CreateTextLabelEntity(pMenu, "GameMsg", GetScreenSizeXf()/2, iPhoneMapY(100), msg);
Entity *pEnt = CreateTextLabelEntity(pMenu, "GameMsg", GetScreenSizeXf() / 2, iPhoneMapY(100), msg);
//SetupTextEntity(pEnt, FONT_LARGE);
SetAlignmentEntity(pEnt, ALIGNMENT_CENTER);
@ -44,12 +44,35 @@ void ShowQuickMessage(string msg)
}
void ShowQuickMessageBottom(string msg)
{
Entity *pMenu = GetEntityRoot()->GetEntityByName("GameMenu");
if (!pMenu)
{
return;
}
Entity *pEnt = CreateTextLabelEntity(pMenu, "GameMsg", GetScreenSizeXf() / 2, iPhoneMapY(250), msg);
SetAlignmentEntity(pEnt, ALIGNMENT_CENTER);
pEnt->GetComponentByName("TextRender")->GetVar("shadowColor")->Set(MAKE_RGBA(0, 0, 0, 200));
FadeInEntity(pEnt);
FadeOutAndKillEntity(pEnt, true, 1000, 1000);
}
void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent from
{
Entity *pEntClicked = pVList->m_variant[1].GetEntity();
Entity *pMenu = GetEntityRoot()->GetEntityByName("GameMenu");
if (pMenu->GetEntityByName("PauseMenu")) return;
//LogMsg("Clicked %s entity at %s", pEntClicked->GetName().c_str(),pVList->m_variant[1].Print().c_str());
if (pEntClicked->GetName() == "pause")
@ -59,16 +82,42 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
//sjoy.joybit[5] = TRUE
g_dglo.m_dirInput[DINK_INPUT_BUTTON5] = true;
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON5] = true;
//if we ONLY want the game to handle this, we'd enable this return...
//return;
}
if (!pMenu->GetEntityByName("PauseMenu"))
if (GetApp()->UseClassicEscapeMenu())
{
pMenu->RemoveComponentByName("FocusInput");
PauseMenuCreate(pMenu);
#ifdef WINAPI
if (GetKeyState(VK_SHIFT) & 0xfe)
{
if (!pMenu->GetEntityByName("PauseMenu"))
{
pMenu->RemoveComponentByName("FocusInput");
PauseMenuCreate(pMenu);
}
return;
}
#endif
g_dglo.m_dirInput[DINK_INPUT_BUTTON5] = true;
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON5] = true;
ShowQuickMessageBottom("(Use Shift-Escape to bring up the Dink HD menu!)");
return;
}
else
{
if (!pMenu->GetEntityByName("PauseMenu"))
{
pMenu->RemoveComponentByName("FocusInput");
PauseMenuCreate(pMenu);
}
}
}
if (pEntClicked->GetName() == "attack")