Merge remote-tracking branch 'ymber/embark-profile-name' into develop
commit
4e957eafe2
@ -1,22 +1,24 @@
|
|||||||
#include "df/viewscreen_setupdwarfgamest.h"
|
#include "df/viewscreen_setupdwarfgamest.h"
|
||||||
using namespace DFHack;
|
|
||||||
struct embark_profile_name_hook : df::viewscreen_setupdwarfgamest {
|
struct embark_profile_name_hook : df::viewscreen_setupdwarfgamest {
|
||||||
typedef df::viewscreen_setupdwarfgamest interpose_base;
|
typedef df::viewscreen_setupdwarfgamest interpose_base;
|
||||||
DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input))
|
|
||||||
{
|
DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input)) {
|
||||||
int ch = -1;
|
int ch = -1;
|
||||||
for (auto it = input->begin(); ch == -1 && it != input->end(); ++it)
|
for (auto it = input->begin(); ch == -1 && it != input->end(); ++it) {
|
||||||
ch = Screen::keyToChar(*it);
|
ch = Screen::keyToChar(*it);
|
||||||
if (in_save_profile && ch >= 32 && ch <= 126)
|
|
||||||
{
|
|
||||||
profile_name.push_back((char)ch);
|
|
||||||
}
|
}
|
||||||
else
|
// Intercept all printable characters except space.
|
||||||
{
|
// If space is intercepted the shift-space abort key will not work.
|
||||||
if (input->count(df::interface_key::LEAVESCREEN))
|
if (in_save_profile && ch >= 33 && ch <= 126) {
|
||||||
|
profile_name.push_back((char)ch);
|
||||||
|
} else {
|
||||||
|
if (input->count(df::interface_key::LEAVESCREEN)) {
|
||||||
input->insert(df::interface_key::SETUPGAME_SAVE_PROFILE_ABORT);
|
input->insert(df::interface_key::SETUPGAME_SAVE_PROFILE_ABORT);
|
||||||
|
}
|
||||||
INTERPOSE_NEXT(feed)(input);
|
INTERPOSE_NEXT(feed)(input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
IMPLEMENT_VMETHOD_INTERPOSE(embark_profile_name_hook, feed);
|
IMPLEMENT_VMETHOD_INTERPOSE(embark_profile_name_hook, feed);
|
||||||
|
Loading…
Reference in New Issue