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

* Some stuff with changing the Dink HD menu key to F1 from Shift-Escape

Browse source 
* Added Dan's .png loading patch (untested)

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1522 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-10-17 04:33:21 +00:00
parent 20f8a6a856
commit e0b2d2e5f0
17 changed files with 353 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/GUI/AboutMenu.cpp
View file

@ -212,8 +212,9 @@ if (IsDesktop())
"Enter ``- `8Inventory screen/Inventory select\n``"\
"M ``- `8Show map\n\n``"\
"TAB ``- `8Speed up game (hold it down)\n``"\
"F1 ``- `8Quick state save\n``"\
"F4 ``- `8Quick state save\n``"\
"F8 ``- `8Quick state load\n``"\
"F1 ``- `8Dink HD Menu\n``"\
"Alt-Enter ``- `8Toggle fullscreen\n``"\
"Drag window corners ``- `8Changes screensize. Hold Shift to allow any aspect ratio\n``"\
"\n`6Stuck? Try visiting `wdinknetwork.com`` or use google to find a walkthrough.\n"\

25
source/GUI/GameMenu.cpp
View file

@ -89,6 +89,7 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
{
#ifdef WINAPI
/*
if (GetKeyState(VK_SHIFT) & 0xfe)
{
if (!pMenu->GetEntityByName("PauseMenu"))
@ -98,12 +99,13 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
}
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!)");
ShowQuickMessageBottom("(Use `wF1`` to bring up the Dink HD menu!)");
return;
}
else
@ -1121,12 +1123,31 @@ void OnArcadeInput(VariantList *pVList)
LogMsg("Quitting");
break;
case VIRTUAL_KEY_F1:
case VIRTUAL_KEY_F4:
if (bIsDown)
SaveStateWithExtra();
break;
case VIRTUAL_KEY_F1:
if (bIsDown)
{
Entity *pMenu = GetEntityRoot()->GetEntityByName("GameMenu");
if (pMenu)
{
if (!pMenu->GetEntityByName("PauseMenu"))
{
pMenu->RemoveComponentByName("FocusInput");
PauseMenuCreate(pMenu);
}
}
}
break;
case VIRTUAL_KEY_F8:
{
if (bIsDown)

2
source/GUI/MainMenu.cpp
View file

@ -211,6 +211,8 @@ void MainMenuOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sen
string GetNextDMODToInstall(bool &bIsCommandLineInstall, const bool bDeleteCommandLineParms)
{
bIsCommandLineInstall = false;
//if (!GetApp()->CanDownloadDMODS()) return ""; //ignore it
if (IsDesktop())

8
source/GUI/PauseMenu.cpp
View file

@ -403,6 +403,14 @@ Entity * PauseMenuCreate(Entity *pParentEnt)
pKeys->GetVar("disabled")->Set(uint32(1));
GetMessageManager()->SetComponentVariable(pKeys, 500, "disabled", uint32(0)); //enable it again
if (IsDesktop())
{
EntityComponent *pKeys = AddHotKeyToButton(pButtonEntity, VIRTUAL_KEY_F1);
//work around problem of it instantly closing
pKeys->GetVar("disabled")->Set(uint32(1));
GetMessageManager()->SetComponentVariable(pKeys, 500, "disabled", uint32(0)); //enable it again
}
/*
pKeys = AddHotKeyToButton(pButtonEntity, VIRTUAL_KEY_PROPERTIES);
//work around problem of it instantly closing