-geo option works correctly when switching to the same geometry. -qpar2 now generates the extra primes automatically.

This commit is contained in:
Zeno Rogue 2018-07-06 19:59:29 +02:00
parent 4fa25e9883
commit 300dfde6da
1 changed files with 6 additions and 1 deletions

View File

@ -236,7 +236,8 @@ else if(args()[0] == '-' && args()[1] == x && args()[2] == '0') { PHASEFROM(2);
}
else if(argis("-geo")) {
shift(); targetgeometry = (eGeometry) argi();
stop_game_and_switch_mode(rg::geometry);
if(targetgeometry != rg::geometry)
stop_game_and_switch_mode(rg::geometry);
}
else if(argis("-gp")) {
PHASEFROM(2);
@ -323,6 +324,10 @@ else if(args()[0] == '-' && args()[1] == x && args()[2] == '0') { PHASEFROM(2);
shift(); sscanf(argcs(), "%d,%d", &a, &b);
using namespace fieldpattern;
current_extra = a;
auto& gxcur = fgeomextras[current_extra];
while(b >= isize(gxcur.primes)) nextPrime(gxcur);
fgeomextras[current_extra].current_prime_id = b;
enableFieldChange();
if(geometry != gFieldQuotient) {