mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-11-17 22:25:12 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
@@ -1370,7 +1370,6 @@ EX namespace dialog {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void number_dialog_help :: operator() () {
|
void number_dialog_help :: operator() () {
|
||||||
auto ne = *ptr;
|
|
||||||
init("number dialog help");
|
init("number dialog help");
|
||||||
dialog::addBreak(100);
|
dialog::addBreak(100);
|
||||||
dialog::addHelp(XLAT("You can enter formulas in this dialog."));
|
dialog::addHelp(XLAT("You can enter formulas in this dialog."));
|
||||||
@@ -1380,7 +1379,7 @@ EX namespace dialog {
|
|||||||
dialog::addBreak(100);
|
dialog::addBreak(100);
|
||||||
dialog::addHelp(XLAT("Constants and variables available:"));
|
dialog::addHelp(XLAT("Constants and variables available:"));
|
||||||
addHelp(available_constants());
|
addHelp(available_constants());
|
||||||
if(ptr && ne.animatable) {
|
if(ptr && ptr->animatable) {
|
||||||
dialog::addBreak(100);
|
dialog::addBreak(100);
|
||||||
dialog::addHelp(XLAT("Animations:"));
|
dialog::addHelp(XLAT("Animations:"));
|
||||||
dialog::addHelp(XLAT("a..b -- animate linearly from a to b"));
|
dialog::addHelp(XLAT("a..b -- animate linearly from a to b"));
|
||||||
@@ -1395,7 +1394,7 @@ EX namespace dialog {
|
|||||||
|
|
||||||
#if CAP_ANIMATIONS
|
#if CAP_ANIMATIONS
|
||||||
dialog::addBreak(50);
|
dialog::addBreak(50);
|
||||||
auto f = find_edit(!ptr ? nullptr : ne.intval ? (void*) ne.intval : (void*) ne.editwhat);
|
auto f = find_edit(!ptr ? nullptr : ptr->intval ? (void*) ptr->intval : (void*) ptr->editwhat);
|
||||||
if(f)
|
if(f)
|
||||||
dialog::addHelp(XLAT("Parameter names, e.g. '%1'", f->name));
|
dialog::addHelp(XLAT("Parameter names, e.g. '%1'", f->name));
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user