mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-02-02 20:29:17 +00:00
Fix some compiler errors and a mistake in config.cpp.
This commit is contained in:
parent
2486937720
commit
48800f58f8
@ -2737,7 +2737,7 @@ EX void selectLanguageScreen() {
|
|||||||
int v = vid.language;
|
int v = vid.language;
|
||||||
dynamicval<int> d(vid.language, -1);
|
dynamicval<int> d(vid.language, -1);
|
||||||
|
|
||||||
for(int i=0; i<NUMLAN-1 || i == v; i++) {
|
for(int i=0; i<NUMLAN; i++) {
|
||||||
vid.language = i;
|
vid.language = i;
|
||||||
dialog::addSelItem(XLAT("EN"), its(100 * transcompleteness[i] / transcompleteness[0]) + "%", 'a'+i);
|
dialog::addSelItem(XLAT("EN"), its(100 * transcompleteness[i] / transcompleteness[0]) + "%", 'a'+i);
|
||||||
}
|
}
|
||||||
|
@ -447,7 +447,7 @@ struct debugScreen {
|
|||||||
dialog::addBack();
|
dialog::addBack();
|
||||||
dialog::display();
|
dialog::display();
|
||||||
|
|
||||||
keyhandler = [this, what] (int sym, int uni) {
|
keyhandler = [this] (int sym, int uni) {
|
||||||
handlePanning(sym, uni);
|
handlePanning(sym, uni);
|
||||||
dialog::handleNavigation(sym, uni);
|
dialog::handleNavigation(sym, uni);
|
||||||
if(applyCheat(uni)) ;
|
if(applyCheat(uni)) ;
|
||||||
|
@ -3054,14 +3054,14 @@ EX hyperpoint lie_log(hyperpoint h) {
|
|||||||
}
|
}
|
||||||
else if(sol && !nih) {
|
else if(sol && !nih) {
|
||||||
h[3] = 0;
|
h[3] = 0;
|
||||||
if(abs(h[2] > 1e-6)) {
|
if(abs(h[2]) > 1e-6) {
|
||||||
h[0] *= -h[2] / (exp(-h[2]) - 1);
|
h[0] *= -h[2] / (exp(-h[2]) - 1);
|
||||||
h[1] *= h[2] / (exp(+h[2]) - 1);
|
h[1] *= h[2] / (exp(+h[2]) - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(sol && nih) {
|
else if(sol && nih) {
|
||||||
h[3] = 0;
|
h[3] = 0;
|
||||||
if(abs(h[2] > 1e-6)) {
|
if(abs(h[2]) > 1e-6) {
|
||||||
ld z = h[2] * log(2);
|
ld z = h[2] * log(2);
|
||||||
h[0] *= -z / (exp(-z) - 1);
|
h[0] *= -z / (exp(-z) - 1);
|
||||||
z = h[2] * log(3);
|
z = h[2] * log(3);
|
||||||
@ -3070,7 +3070,7 @@ EX hyperpoint lie_log(hyperpoint h) {
|
|||||||
}
|
}
|
||||||
else if(nih) {
|
else if(nih) {
|
||||||
h[3] = 1;
|
h[3] = 1;
|
||||||
if(abs(h[2] > 1e-6)) {
|
if(abs(h[2]) > 1e-6) {
|
||||||
ld z = h[2] * log(2);
|
ld z = h[2] * log(2);
|
||||||
h[0] *= z / (exp(+z) - 1);
|
h[0] *= z / (exp(+z) - 1);
|
||||||
z = h[2] * log(3);
|
z = h[2] * log(3);
|
||||||
|
Loading…
Reference in New Issue
Block a user