correct map geometry displayed in welcome message, and both displayed in EwG
This commit is contained in:
parent
db43ea9de8
commit
e1ce20cabe
11
geom-exp.cpp
11
geom-exp.cpp
|
@ -507,8 +507,8 @@ EX void showQuotientConfig3() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
EX string geometry_name() {
|
EX string geometry_name(eGeometryClass gc) {
|
||||||
switch(ginf[geometry].cclass) {
|
switch(gc) {
|
||||||
case gcHyperbolic:
|
case gcHyperbolic:
|
||||||
return XLAT("hyperbolic") + dim_name();
|
return XLAT("hyperbolic") + dim_name();
|
||||||
|
|
||||||
|
@ -541,6 +541,13 @@ EX string geometry_name() {
|
||||||
return "?";
|
return "?";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EX string geometry_name() {
|
||||||
|
if(embedded_plane)
|
||||||
|
return geometry_name(geom3::mgclass()) + " @ " + geometry_name(geom3::ggclass());
|
||||||
|
else
|
||||||
|
return geometry_name(ginf[geometry].cclass);
|
||||||
|
};
|
||||||
|
|
||||||
EX void select_quotient_screen() {
|
EX void select_quotient_screen() {
|
||||||
cmode = sm::SIDE | sm::MAYDARK;
|
cmode = sm::SIDE | sm::MAYDARK;
|
||||||
gamescreen();
|
gamescreen();
|
||||||
|
|
|
@ -77,6 +77,7 @@ EX hookset<bool()> hooks_welcome_message;
|
||||||
/** \brief Print the welcome message during the start of game. Depends on the current mode and other settings. */
|
/** \brief Print the welcome message during the start of game. Depends on the current mode and other settings. */
|
||||||
EX void welcomeMessage() {
|
EX void welcomeMessage() {
|
||||||
if(callhandlers(false, hooks_welcome_message)) return;
|
if(callhandlers(false, hooks_welcome_message)) return;
|
||||||
|
if(embedded_plane) return IPF(welcomeMessage());
|
||||||
#if CAP_TOUR
|
#if CAP_TOUR
|
||||||
else if(tour::on) return; // displayed by tour
|
else if(tour::on) return; // displayed by tour
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue