1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-27 02:20:36 +00:00
Commit Graph

18 Commits

Author SHA1 Message Date
Zeno Rogue
b6202f5443 fixed a bug introduced by removal of unordered_map 2020-11-07 16:12:54 +01:00
Arthur O'Dwyer
d163a01b8a Remove USE_UNORDERED_MAP because it has bit-rotted.
Trying to compile with `-DUSE_UNORDERED_MAP` produces lots of compiler errors
like these, because of missing `std::hash` specializations.
Also, `#define unordered_map map` is just evil!

```
./nonisotropic.cpp:875:36: note: in instantiation of template class 'std::__1::unordered_map<hr::nilv::mvec, hr::heptagon *,
      std::__1::hash<hr::nilv::mvec>, std::__1::equal_to<hr::nilv::mvec>, std::__1::allocator<std::__1::pair<const hr::nilv::mvec, hr::heptagon
      *> > >' requested here
    unordered_map<mvec, heptagon*> at;
                                   ^

./nonisotropic.cpp:239:58: note: in instantiation of template class 'std::__1::unordered_map<std::__1::pair<hr::heptagon *, hr::heptagon *>,
      hr::heptagon *, std::__1::hash<std::__1::pair<hr::heptagon *, hr::heptagon *> >, std::__1::equal_to<std::__1::pair<hr::heptagon *,
      hr::heptagon *> >, std::__1::allocator<std::__1::pair<const std::__1::pair<hr::heptagon *, hr::heptagon *>, hr::heptagon *> > >'
      requested here
    unordered_map<pair<heptagon*, heptagon*>, heptagon*> at;
                                                         ^

./nonisotropic.cpp:457:49: error: no matching member function for call to 'iadj'
      while(h1->distance < h2->distance) back = iadj(h2, down) * back, h2 = h2->cmove(down);
                                                ^~~~
cell.cpp:42:15: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  transmatrix iadj(heptagon *h, int d) {
              ^
cell.cpp:41:22: note: candidate function not viable: no known conversion from 'hr::sn::hrmap_solnih' to 'hr::hrmap' for object argument
  struct transmatrix iadj(cell *c, int i) { cell *c1 = c->cmove(i); return adj(c1, c->c.spin(i)); }
                     ^
```
2020-10-19 13:15:29 -04:00
Zeno Rogue
9d0a252d14 shift-awareness in rogueviz 2020-07-29 23:34:00 +02:00
Zeno Rogue
b5219ad0fe moved CAP_NCONF and CAP_RVSLIDES back to rogueviz 2020-05-15 12:04:29 +02:00
Arthur O'Dwyer
f2b7746c1b Move all defaulting-of-CAP_FOO to sysconfig.h.
- The phrase `#ifdef CAP_` should never appear anywhere.

- The phrase `#ifndef CAP_` should appear only in sysconfig.h.

- The phrases `#if CAP_` and `#if !CAP_` may appear wherever,
    as long as "sysconfig.h" is included first.

The rules for `CAP_FOO` equally apply to `ISFOO`.

There are many one-off macros still tested with `#ifdef`,
including `HAVE_ACHIEVEMENTS`, `PRINT_ACHIEVEMENTS`,
`FAKEWEB`, `FAKE_SDL`, `EASY`, and `WHATEVER`. I don't
have much grasp on what these are used for or how they're
configured, so I'm leaving them alone.
2020-05-03 15:12:12 -04:00
Zeno Rogue
894abf218f rogueviz:: adjusted to pconf 2020-04-17 20:45:00 +02:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
1d76e455e1 fixed some errors 2020-03-17 03:44:35 +01:00
Zeno Rogue
227171ca05 nconf: highlight cursor 2020-03-16 21:11:15 +01:00
Zeno Rogue
5f93ac20b9 web version did not draw lines for some reason 2020-03-16 21:11:03 +01:00
Zeno Rogue
90393f8c99 inHighQual does not draw pixels for some reason 2020-03-16 21:10:45 +01:00
Zeno Rogue
fedcd95708 nconf: save animation with shift+X 2020-03-16 21:09:25 +01:00
Zeno Rogue
558d7f9bba nconf: changing the pattern 2020-03-16 21:08:24 +01:00
Zeno Rogue
c8f47407fd nconf: genellipse 2020-03-16 21:07:07 +01:00
Zeno Rogue
7a5178e8a6 added #include hyper.h to newconf 2020-03-16 21:06:46 +01:00
Zeno Rogue
d7c57d3b6b updated rogueviz to changes in HyperRogue 2019-10-27 13:14:40 +01:00
Zeno Rogue
39a6c2131b added #undef self 2019-09-23 01:07:03 +02:00
Zeno Rogue
cbcc0f28ed renamed the RogueViz files 2019-09-12 22:50:16 +02:00