|
|
@ -39,6 +39,7 @@ void SetCoord(df::coord in, RemoteFortressReader::Coord *out)
|
|
|
|
|
|
|
|
|
|
|
|
command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
|
|
|
|
command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Removed for v50 which has no adventure mode.
|
|
|
|
auto viewScreen = getCurViewscreen();
|
|
|
|
auto viewScreen = getCurViewscreen();
|
|
|
|
if (!in->has_direction())
|
|
|
|
if (!in->has_direction())
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
@ -186,12 +187,13 @@ command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParam
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return CR_OK;
|
|
|
|
*/ return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
|
|
|
|
command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParams *in)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!in->has_direction())
|
|
|
|
/* Removed for v50 which has no adventure mode.
|
|
|
|
|
|
|
|
if (!in->has_direction())
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
if (!df::global::adventure->menu == ui_advmode_menu::Default)
|
|
|
|
if (!df::global::adventure->menu == ui_advmode_menu::Default)
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
@ -228,12 +230,14 @@ command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParam
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
keyQueue.push(interface_key::SELECT);
|
|
|
|
keyQueue.push(interface_key::SELECT);
|
|
|
|
|
|
|
|
*/
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in, MenuContents *out)
|
|
|
|
command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in, MenuContents *out)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto advUi = df::global::adventure;
|
|
|
|
/* Removed for v50 which has no adventure mode.
|
|
|
|
|
|
|
|
auto advUi = df::global::adventure;
|
|
|
|
|
|
|
|
|
|
|
|
if (advUi == NULL)
|
|
|
|
if (advUi == NULL)
|
|
|
|
return CR_FAILURE;
|
|
|
|
return CR_FAILURE;
|
|
|
@ -272,12 +276,13 @@ command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in,
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfproto::IntMessage *in)
|
|
|
|
command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfproto::IntMessage *in)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Removed for v50 which has no adventure mode.
|
|
|
|
if (!(df::global::adventure->menu == ui_advmode_menu::MoveCarefully))
|
|
|
|
if (!(df::global::adventure->menu == ui_advmode_menu::MoveCarefully))
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
int choice = in->value();
|
|
|
|
int choice = in->value();
|
|
|
@ -288,12 +293,14 @@ command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfprot
|
|
|
|
keyQueue.push(interface_key::SECONDSCROLL_PAGEDOWN);
|
|
|
|
keyQueue.push(interface_key::SECONDSCROLL_PAGEDOWN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
keyQueue.push((interface_key::interface_key)(interface_key::OPTION1 + select));
|
|
|
|
keyQueue.push((interface_key::interface_key)(interface_key::OPTION1 + select));
|
|
|
|
|
|
|
|
*/
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMoveParams *in)
|
|
|
|
command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMoveParams *in)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!df::global::adventure->menu == ui_advmode_menu::Default)
|
|
|
|
/* Removed for v50 which has no adventure mode.
|
|
|
|
|
|
|
|
if (!df::global::adventure->menu == ui_advmode_menu::Default)
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
|
|
|
|
|
|
|
|
auto type = in->type();
|
|
|
|
auto type = in->type();
|
|
|
@ -312,6 +319,6 @@ command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMovePara
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|