1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-15 14:27:37 +00:00

changed chamfered to bitruncated

This commit is contained in:
Zeno Rogue
2018-01-06 22:34:03 +01:00
parent 1427147fbc
commit 5bf6d54c7d
40 changed files with 357 additions and 357 deletions

View File

@@ -88,7 +88,7 @@ namespace mapstream {
int32_t i = VERNUM; save(i);
save(patterns::whichPattern);
save(geometry);
save(nonchamfered);
save(nonbitrunc);
if(geometry == gTorus) {
save(torusconfig::qty);
save(torusconfig::dx);
@@ -173,7 +173,7 @@ namespace mapstream {
if(vernum >= 10203) {
load(geometry);
load(nonchamfered);
load(nonbitrunc);
if(geometry == gTorus) {
load(torusconfig::qty);
load(torusconfig::dx);
@@ -631,7 +631,7 @@ namespace mapeditor {
if(painttype == 4 && radius) {
if(where.c->type != copysource.c->type) return;
if(where.spin<0) where.spin=0;
if(!nonchamfered && !ctof(mouseover) && ((where.spin&1) != (copysource.spin&1)))
if(!nonbitrunc && !ctof(mouseover) && ((where.spin&1) != (copysource.spin&1)))
cwspin(where, 1);
}
if(painttype != 4) copysource.c = NULL;
@@ -1280,7 +1280,7 @@ namespace mapeditor {
fscanf(f, "%d%d%d%d\n", &tg, &nt, &wp, &patterns::subpattern_flags);
patterns::whichPattern = wp;
if(tg != geometry) { targetgeometry = eGeometry(tg); restartGame('g', 0, true); }
if(nt != nonchamfered) { restartGame('7', 0, true); }
if(nt != nonbitrunc) { restartGame('7', 0, true); }
}
while(true) {
@@ -1324,7 +1324,7 @@ namespace mapeditor {
fprintf(f, "HyperRogue saved picture\n");
fprintf(f, "%x\n", VERNUM_HEX);
if(VERNUM_HEX >= 0xA0A0)
fprintf(f, "%d %d %d %d\n", geometry, nonchamfered, patterns::whichPattern, patterns::subpattern_flags);
fprintf(f, "%d %d %d %d\n", geometry, nonbitrunc, patterns::whichPattern, patterns::subpattern_flags);
for(int i=0; i<USERSHAPEGROUPS; i++) for(int j=0; j<USERSHAPEIDS; j++) {
usershape *us = usershapes[i][j];
if(!us) continue;