1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Commit Graph

42 Commits

Author SHA1 Message Date
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
1789ad1a33 improved presentation support in RogueViz 2020-09-11 11:48:27 +02:00
Zeno Rogue
3eb576e309 a fix in rogueviz 2020-09-11 11:41:09 +02:00
Zeno Rogue
804e426c2a nicer support for multiple slideshows 2020-09-11 11:21:52 +02:00
Zeno Rogue
b3dd70f26a rogueviz shift fixup 2020-07-30 02:30:07 +02:00
Zeno Rogue
9d0a252d14 shift-awareness in rogueviz 2020-07-29 23:34:00 +02:00
Zeno Rogue
ed6cd3cec6 rewritten the o-key functionality to let the user choose from several applicable options 2020-05-15 15:53: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
5b26fd0059 removed ref to leftclick 2020-04-22 14:15:50 +02:00
Arthur O'Dwyer
934e3d9a42 Consistently name every hookset with prefix hooks_. NFC.
I'm sure this causes massive merge-conflicts in the non-public code,
but I think it'd be a good idea, if only to avoid confusion between
e.g. `clearMemory` and the-variable-formerly-known-as `clearmemory`.
2020-04-12 10:49:32 -04:00
Zeno Rogue
cb25dd27be removed rogueviz::cspin (conflicts with hr::cspin and unused) 2020-04-09 07:40:12 +02:00
Zeno Rogue
f5ce50cc9e fixed compiling without CAP_RVSLIDES 2020-04-01 11:27:26 +02:00
Zeno Rogue
c0e11b731a rogueviz.cpp now includes only rogueviz core while rogueviz-all includes all; rogueviz modules can be included separately now 2020-03-29 16:03:31 +02:00
Zeno Rogue
de0218b732 removed ../hyper.h from rogueviz.cpp 2020-03-29 15:38:06 +02:00
Zeno Rogue
220d23124b moved cname() to sag 2020-03-29 15:37:56 +02:00
Zeno Rogue
133bbe5b93 rogueviz:: spiral to a separate file 2020-03-29 15:36:43 +02:00
Zeno Rogue
8a5c4b0887 rogueviz:: fixed init 2020-03-29 15:24:37 +02:00
Zeno Rogue
427df5e8fe patterns export patPalace, patZebraTriangles, patZebraLines 2020-03-29 15:23:18 +02:00
Zeno Rogue
0a7e413f87 rogueviz:: fullnet as separate file 2020-03-29 15:14:48 +02:00
Zeno Rogue
24dd8c9376 replaced rogueviz::kind with rogueviz::vizid and rogueviz::vizflags 2020-03-29 15:14:23 +02:00
Zeno Rogue
2d39bac2ef rogueviz:: removed dep on collatz 2020-03-29 14:41:24 +02:00
Zeno Rogue
d3d99d8a87 fixed some dependencies 2020-03-29 14:37:14 +02:00
Zeno Rogue
9cae1cce92 removed refs to kohonen from readcolor 2020-03-29 14:37:04 +02:00
Zeno Rogue
dc7b19ebc8 rogueviz:: more cleanup 2020-03-29 14:10:50 +02:00
Zeno Rogue
4384f65962 moved the remaining slides away from rogueviz.cpp 2020-03-29 13:52:10 +02:00
Zeno Rogue
1e4a7ca6a3 rogueviz:: moved some slides to their files 2020-03-29 13:40:31 +02:00
Zeno Rogue
b3329208c4 redesigned multiple slideshows in HyperRogue, and how rvslides is generated in RogueViz 2020-03-29 13:31:22 +02:00
Zeno Rogue
336d04fed8 moved SAG, tree and Collatz from rogueviz.cpp to separate files 2020-03-29 13:09:10 +02:00
Zeno Rogue
00bbdef12e added some comments in hr::tour 2020-03-27 20:54:21 +01:00
Arthur O'Dwyer
e59d22e399 Silence some pedantic format warnings from Clang.
rogueviz/rogueviz.cpp: In function ‘hr::color_t rogueviz::parse1(const string&)’:
    rogueviz/rogueviz.cpp:76:75: error: format ‘%x’ expects argument
    of type ‘unsigned int*’, but argument 3 has type ‘int*’ [-Werror=format=]
         sscanf(s.c_str(), "R%x,%x,%x,%d,%d", &mh, &minh, &alpha, &step, &start);
                                                                               ^

I believe these three variables should have been `color_t` all along.
I think this fix doesn't change any of the arithmetic, but I could be wrong.
2020-03-23 14:39:30 -04:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
7027905dcc update to rewriting 2020-01-19 21:52:14 +01:00
Zeno Rogue
1cfeba9666 adjusted Rogueviz to HR changes 2019-12-27 12:50:56 +01:00
Zeno Rogue
ab3992f58f adjusted rogueviz 2019-11-30 19:01:01 +01:00
Zeno Rogue
9168abd1a7 adjusted RogueViz 2019-11-14 20:26:07 +01:00
Zeno Rogue
e799f76e5d rogueviz:: legend color is now changeable 2019-10-07 00:10:42 +02:00
Zeno Rogue
dca95aa2aa RogueViz stuff 2019-09-26 13:23:10 +02:00
Zeno Rogue
8bb1c132bc added missing CAP_RVSLIDES 2019-09-23 01:06:57 +02:00
Zeno Rogue
a4579e95c1 added qtm to RogueViz 2019-09-13 09:35:18 +02:00
Zeno Rogue
f1eb4b9ab7 rogueviz:: added Grigorchuk 2019-09-12 22:50:16 +02:00
Zeno Rogue
cbdfc35e10 hooks_display_dialog used in RogueViz 2019-09-12 22:50:16 +02:00
Zeno Rogue
cbcc0f28ed renamed the RogueViz files 2019-09-12 22:50:16 +02:00