eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-31 05:20:52 +01:00
Code Issues 155 Wiki Activity

refactor(editor): a signal head tells the next one shows stop by its chambers alone, an orange light above the red one, not by the events of its template reading the next signal, which the templates of the old sceneries lack

Browse Source
This commit is contained in:
maj00r
2026-10-22 18:54:54 +02:00
parent a811486b53
commit 9c124b23bb
6 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/editorIncludeInfo.cpp
View File

@@ -501,10 +501,9 @@ int parameter_count(std::string const &File)
return read_template(File, text, error) ? count_parameters(text) : 0;
}
bool signal_speeds(std::string const &File, std::vector<int> &Speeds, bool &Informs)
bool signal_speeds(std::string const &File, std::vector<int> &Speeds)
{
Speeds.clear();
Informs = false;
template_text text;
std::string error;
if (false == read_template(File, text, error))
@@ -522,23 +521,17 @@ bool signal_speeds(std::string const &File, std::vector<int> &Speeds, bool &Info
Speed = static_cast<int>(std::lround(value));
return true;
};
for (std::size_t idx = 0; idx + 2 < tokens.size(); ++idx)
for (std::size_t idx = 0; idx + 1 < tokens.size(); ++idx)
{
if (tokens[idx] != "setvelocity")
{
continue;
}
int own{0};
int next{0};
auto const shown{speed(tokens[idx + 1], own)};
if (shown && own != 0 && std::find(Speeds.begin(), Speeds.end(), own) == Speeds.end())
if (speed(tokens[idx + 1], own) && own != 0 && std::find(Speeds.begin(), Speeds.end(), own) == Speeds.end())
{
Speeds.push_back(own);
}
if (speed(tokens[idx + 2], next) && next == 0 && (tokens[idx + 1] == "*" || (shown && own != 0 && own != 20)))
{
Informs = true;
}
}
std::sort(Speeds.begin(), Speeds.end());
return true;

4
editor/editorIncludeInfo.hpp
View File

@@ -69,8 +69,8 @@ bool save(std::string const &File, include_info const &Info, std::string &Error)
// highest number of (pN) placeholder used by specified template, 0 if it has none
int parameter_count(std::string const &File);
// the speeds the events of a signal template set it to show, by their SetVelocity: of the signal itself, km/h, -1 the highest
// allowed, 20 the substitute signal. Informs: one of them tells the next signal shows stop. returns: false if the file can't be read
bool signal_speeds(std::string const &File, std::vector<int> &Speeds, bool &Informs);
// allowed, 20 the substitute signal. returns: false if the file can't be read
bool signal_speeds(std::string const &File, std::vector<int> &Speeds);
// sets roles of the parameters whose use in the template makes their meaning clear. roles already set are left alone
void suggest(std::string const &File, include_info &Info);
// true if value of a parameter with specified role is supplied by the editor when the template is placed