mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-19 11:44:48 +00:00
Code Issues Releases Wiki Activity

irr:: added the missing 'ingore'

Browse Source
This commit is contained in:
Zeno Rogue 2018-07-23 23:37:02 +02:00
parent 548ee3a54f
commit 717cc6b12f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irregular.cpp
View File

@ -706,7 +706,7 @@ bool load_map(const string &fname) {
if(!f) return false; if(!f) return false;
auto& all = base->allcells(); auto& all = base->allcells();
int g, sa; int g, sa;
fscanf(f, "%d %d %d\n", &g, &sa, &cellcount); ignore(fscanf(f, "%d %d %d\n", &g, &sa, &cellcount));
if(sa != isize(all) || g != geometry) { printf("bad parameters\n"); addMessage("bad format or bad map geometry"); return false; } if(sa != isize(all) || g != geometry) { printf("bad parameters\n"); addMessage("bad format or bad map geometry"); return false; }
density = cellcount * 1. / isize(all); density = cellcount * 1. / isize(all);
@ -714,14 +714,14 @@ bool load_map(const string &fname) {
for(auto h: all) { for(auto h: all) {
int q = 0; int q = 0;
fscanf(f, "%d\n", &q); ignore(fscanf(f, "%d\n", &q));
if(q < 0 || q > cellcount) { runlevel = 0; return false; } if(q < 0 || q > cellcount) { runlevel = 0; return false; }
while(q--) { while(q--) {
cells.emplace_back(); cells.emplace_back();
cellinfo& s = cells.back(); cellinfo& s = cells.back();
s.patterndir = -1; s.patterndir = -1;
double a, b, c; double a, b, c;
fscanf(f, "%lf%lf%lf", &a, &b, &c); ignore(fscanf(f, "%lf%lf%lf", &a, &b, &c));
s.p = hpxyz(a, b, c); s.p = hpxyz(a, b, c);
for(auto c0: all) s.relmatrices[c0] = shmup::calc_relative_matrix(c0, h, s.p); for(auto c0: all) s.relmatrices[c0] = shmup::calc_relative_matrix(c0, h, s.p);
s.owner = h; s.owner = h;