1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-30 20:10:35 +00:00
Commit Graph

68 Commits

Author SHA1 Message Date
Zeno Rogue
28383c94e0
Merge branch 'master' into fix_hyperroid 2020-11-06 15:40:59 +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
d64c5e338c extra guards 2020-10-15 16:33:52 +02:00
still-flow
a8691f0d8e fix hyperroid builds
- add cap guards where necessary
- adapt to new `shiftpoint` datatype and function interfaces thereof
2020-10-05 21:48:56 +03:00
Zeno Rogue
b14aeedcf4 2.5D: changed Desert sky colors 2020-08-01 16:47:37 +02:00
Zeno Rogue
a27419cf97 cool fog effect now can be disabled 2020-08-01 16:47:21 +02:00
Zeno Rogue
7c3c34c3d8 sky-based fog in 2.5D 2020-08-01 13:59:53 +02:00
Zeno Rogue
82f32607e6 MAJOR CHANGE: replaced (transmatrix,band_shift) pair with shiftmatrix 2020-07-28 22:06:14 +02:00
Zeno Rogue
f3c35de400 more guards cont. 2020-07-03 14:48:36 +02:00
Zeno Rogue
89585f004b fixed some guards (in progress) 2020-07-03 14:42:33 +02:00
Zeno Rogue
2a0b0101fd raycasting in 2D 2020-06-03 15:11:20 +02:00
Zeno Rogue
2c79a6aeff fixed freeze while drawing the sky in {n,infty} FPP 2020-05-29 10:29:13 +02:00
Zeno Rogue
61e249a3af fixed skies in the new lands 2020-05-16 01:06:47 +02:00
Zeno Rogue
26fb19e7a8 subdivided game.cpp; split movepcto into separate functions 2019-12-08 20:07:02 +01:00
Zeno Rogue
622b683e33 drawcell parameter is now cell, not cellwalker (need to check half-elliptic) 2019-11-30 18:04:54 +01:00
Zeno Rogue
aeaaf7586a refactored map functions: ddspin, iddspin, spacedist, spin_angle, virtualRebase[simple], adj 2019-11-14 16:51:50 +01:00
Zeno Rogue
43bf7c5cfe fixed MAXMDIM guards 2019-11-03 14:19:11 +01:00
Zeno Rogue
85a08d205d refactored celldraw 2019-10-25 12:44:41 +02:00