mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-30 12:00:35 +00:00
Code Issues Releases Wiki Activity
9,559 Commits 1 Branch 66 Tags 131 MiB
146c075210
Commit Graph

304 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
d64c5e338c extra guards 2020-10-15 16:33:52 +02:00
Zeno Rogue
eb6cae8810 fixed crash on initialization of monster() 2020-09-23 22:02:22 +02:00
Zeno Rogue
e26f8f5a5b optimized inverses 2020-09-16 23:49:17 +02:00
Zeno Rogue
b782452a4a push Statue/Fire with Orb of Winter 2020-09-16 23:49:17 +02:00
Zeno Rogue
830a2703dd fixed shmup in elliptic 2020-08-05 01:27:18 +02:00
Zeno Rogue
82f32607e6 MAJOR CHANGE: replaced (transmatrix,band_shift) pair with shiftmatrix 2020-07-28 22:06:14 +02:00
Zeno Rogue
a189fd9ca8 cleaned up findbaseAround 2020-06-03 11:54:28 +02:00
Zeno Rogue
0ae3ab3c9b fake::split() = fake::in() or arb::in_slided() is used when both are applicable for a condition 2020-06-03 11:43:35 +02:00
Zeno Rogue
ab379435d4 with unfitting sliders, also fix shmup 2020-06-02 02:37:30 +02:00
Zeno Rogue
d2c2140cc9 shmup better with fake 2020-06-02 02:27:06 +02:00
Zeno Rogue
f69b6f0795 fixed Orb of Safety in multiplayer 2020-05-16 02:38:13 +02:00
Zeno Rogue
6f6586b3f2
Merge branch 'master' into hooks-naming 2020-04-19 13:39:07 +02:00
Zeno Rogue
0472bf764f moved all projection-related parameters to a special struct; another copy of that struct created for rug 2020-04-17 00:53:58 +02:00
Arthur O'Dwyer
0d42168139 Make hookset<T> a pointer type, just like purehookset. 
No more declaring `hookset<T> *hooks_foo`; now it's just
`hookset<T> hooks_foo` at global scope. This clears the way to
make `hookset<T>` into a class type if we want.
 2020-04-12 10:50:18 -04: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
e4a8b73819 nisot:: nicer precision setting 2020-04-11 15:08:24 +02:00
Zeno Rogue
cfbd5f830c fixed some warnings and errors with ll to int assignment 2020-04-06 09:13:20 +02:00
Arthur O'Dwyer
364c33b1d8 Fix a (likely harmless) integer overflow in shmup.cpp. 
shmup.cpp: In function ‘void hr::shmup::moveMonster(hr::shmup::monster*, int)’:
    shmup.cpp:1851:41: error: overflow in implicit constant conversion [-Werror=overflow]
         else killMonster(m, moNone, AF_CRUSH);
                                             ^
 2020-03-23 14:39:30 -04:00
Zeno Rogue
7096d152be product:: shmup:: monsters rotate correctly 2020-03-21 09:35:54 +01:00
Zeno Rogue
e6b5a333ba fixed pushing in shmup 2020-03-08 00:02:00 +01:00
Zeno Rogue
a9febe3122 fixed a bug with Greater Demons in shmup 2020-03-07 12:21:12 +01:00
Zeno Rogue
109b57df14 added a comma in shmup help text 2020-01-28 17:58:55 +01:00
Zeno Rogue
1fc05a99b8 queuechr fixup 2019-12-27 00:50:54 +01:00
Zeno Rogue
c247936e34 removed the functions queuechr -- use queuestr now 2019-12-26 23:38:28 +01:00
Zeno Rogue
26fb19e7a8 subdivided game.cpp; split movepcto into separate functions 2019-12-08 20:07:02 +01:00
Zeno Rogue
8386a14d6a 'circles' are now drawn on all copies in quotient geometries 2019-12-06 14:03:02 +01:00
Zeno Rogue
dafb4ae582 correctly display/rotate the PC in product 2019-12-06 12:15:33 +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
982f01e6e5 tracking the specific copy of the player in confusing geometries 2019-11-23 19:05:24 +01:00
Zeno Rogue
bf584b5429 more movei 2019-11-22 18:48:51 +01:00
Zeno Rogue
6d44105fef more movei. Also animated Friendly Ivy growth 2019-11-22 18:07:16 +01:00
Zeno Rogue
2172ca6fd7 movei used in more places, also improved push in shmup 2019-11-22 17:31:23 +01:00
Zeno Rogue
ad501869f1 added some missing guards 2019-11-15 14:52:21 +01:00
Zeno Rogue
45ba2f0229 shmup:: sharks on dry land now die/transform 2019-11-14 20:20:35 +01:00
Zeno Rogue
a6d36228b7 shmup:: Butterflies are no longer killable 2019-11-14 20:11:16 +01:00
Zeno Rogue
ef98e048bb shmup:: incorrect cpid protection (just in case) 2019-11-14 20:08:23 +01:00
Zeno Rogue
7602048b06 inv computed in shmup 2019-11-14 19:51:25 +01:00
Zeno Rogue
012d833f50 removed the tohex parameter 2019-11-14 19:33:55 +01:00
Zeno Rogue
85a08d205d refactored celldraw 2019-10-25 12:44:41 +02:00
Zeno Rogue
d11b768bf1 removed destucking code as stucking was fixed by another bugfix 2019-10-06 12:13:30 +02:00
Zeno Rogue
cd04b3f8e8 precision argument for parallel_transport, and reducing it when used many times 2019-10-06 12:10:43 +02:00
Zeno Rogue
54487eb6f3 buffer enforced for the player in 3D shmup 2019-10-06 12:10:43 +02:00
Zeno Rogue
e192506943 fixed mimics in 3D nonisotropic 2019-10-05 18:55:11 +02:00
Zeno Rogue
7f9ffe14af racing:: in 3D, you now reflect off blocking walls 2019-10-05 18:55:11 +02:00
Zeno Rogue
a023003560 stuck prevention and wall sliding 2019-10-05 18:55:11 +02:00
Zeno Rogue
82f7ae05d2 findbase now gets a parameter which tells how many steps to make 2019-10-05 18:55:11 +02:00
Zeno Rogue
aef1787daf fixed a bug with monster placement in shmup 2019-09-30 01:51:28 +02:00
Zeno Rogue
7528acfb23 shmup:: fixed a bug with going through walls 2019-09-28 14:58:38 +02:00
Zeno Rogue
85504de44b shmup:: no more orb usage after death 2019-09-27 17:06:12 +02:00
Zeno Rogue
4c0f2d0ea7 changed the use of m->type == moAsteroid to inertia_based 2019-09-26 13:23:44 +02:00
Zeno Rogue
dca95aa2aa RogueViz stuff 2019-09-26 13:23:10 +02:00
Zeno Rogue
848eb8f48b export everything: modules compiled separately 2019-09-12 22:50:16 +02:00
Zeno Rogue
9647cbd47e added #include hyper.h to all cpp files 2019-09-12 22:50:16 +02:00
Zeno Rogue
b82a0a8dba shmup:: fixed the keyboard rotation direction inconsistency in 3D 2019-09-12 22:50:15 +02:00
Zeno Rogue
465e93ec57 shmup:: fixed distance checking for product 2019-09-12 22:50:15 +02:00
Zeno Rogue
61ea588ffb shmup for product: player movement 2019-09-12 22:50:15 +02:00
Zeno Rogue
96bf478482 renamed DIM to GDIM 2019-09-12 22:50:13 +02:00
Zeno Rogue
8b1c7bffe4 initial reformatting of comments for Doxygen 2019-09-12 22:50:13 +02:00
Zeno Rogue
ad03115097 further cleanup 2019-09-12 22:50:13 +02:00
Zeno Rogue
245ee5878f removed function dirfromto as it was equal to neighborId 2019-09-12 22:50:12 +02:00
Zeno Rogue
f723a8d419 further cleanup, separated multi.cpp from shmup.cpp 2019-09-12 22:50:12 +02:00
Zeno Rogue
05bd7a905c more header cleanup 2019-09-12 22:50:12 +02:00
Zeno Rogue
661743a19b removed the obsolete *MovR functions 2019-09-12 22:50:12 +02:00
Zeno Rogue
c131e21198 namespace hyperpoint_vec removed 2019-09-12 22:50:12 +02:00
Zeno Rogue
64ad97cf2f shmup:: no longer ignores frame limit (just sets it to 30) 2019-09-12 22:50:12 +02:00
Zeno Rogue
a6b71facfb fixed spin_towards 2019-09-12 22:50:11 +02:00
Zeno Rogue
774c871c74 sol:: basic shmup works 2019-09-12 22:50:10 +02:00
Zeno Rogue
148db6b84c fixed a bug with recall+safety in Shmup 2019-09-12 22:50:10 +02:00
Zeno Rogue
a95eb81b33 shmup:: collect items when bumping into them in a boat 2019-09-12 22:50:10 +02:00
Zeno Rogue
0d65b73227 correction of CAP_SDL guard 2019-09-12 22:50:08 +02:00
Zeno Rogue
977c5f2d69 CAP_MOUSEGRAB 2019-09-12 22:50:08 +02:00
Zeno Rogue
925d06a2b8 dead zones are now configured via number dialog 2019-09-12 22:50:08 +02:00
Zeno Rogue
b1d8388795 2D3D:: improved controller panning 2019-09-12 22:50:08 +02:00
Zeno Rogue
9d93da1472 fixed Up/Down in shmup mode, also reversed Left/Right for intuitiveness 2019-09-12 22:50:08 +02:00
Zeno Rogue
db988058de added a separate option axes3 for highlighting forward, and in different location 2019-09-12 22:50:08 +02:00
Zeno Rogue
dd212d756b fixed the monster color in the minimap for Dragons etc 2019-09-12 22:50:08 +02:00
Zeno Rogue
6b3f2a94e4 fixed 'extra knife' orbs in 3D 2019-09-12 22:50:06 +02:00
Zeno Rogue
45c39c6fd8 fixed the multiplayer config screen 2019-09-12 22:50:06 +02:00
Zeno Rogue
d864c8cc1e racing:: speedometer 2019-09-12 22:50:05 +02:00
Zeno Rogue
f4f6d2c028 rogueviz:: highlighting correctly 2019-09-12 22:50:04 +02:00
Zeno Rogue
0489cde78e added some missing externs 2019-09-12 22:50:04 +02:00
Zeno Rogue
e81912c11e shmup/centerpc:: some sanity checks to prevent the PC from disappearing 2019-09-12 22:50:04 +02:00
Zeno Rogue
a49de4530f dual:: added some missing gd->store's 2019-09-12 22:50:04 +02:00
Zeno Rogue
83d1e048e7 dual:: shmup mouseaim correctly dualized 2019-09-12 22:50:04 +02:00
Zeno Rogue
c820f9a2f0 dual and multiplayer are not compatible (do not appear if other is on) 2019-09-12 22:50:04 +02:00
Zeno Rogue
182df69535 dual:: shmup 2019-09-12 22:50:04 +02:00
Zeno Rogue
3c9f0096e1 removed vid.scfg from vid 2019-09-12 22:50:04 +02:00
Zeno Rogue
6467e38537 recallCell now remembers orientation (is cellwalker) 2019-09-12 22:50:03 +02:00
Zeno Rogue
8295251cdc multigame support, including dualmode 2019-09-12 22:50:03 +02:00
Zeno Rogue
b6e303ec7d MAJOR refactoring: all geometry-dependent data (tessf, geom3::, shapes, hpc) are now contained in a structure 2019-09-12 22:50:03 +02:00
Zeno Rogue
6012cbc8e2 racing: in SpaceRocks 2019-09-12 22:50:02 +02:00
Zeno Rogue
ae100b1e72 removed some obsolete debug printfs 2019-09-12 22:50:02 +02:00
Zeno Rogue
923d94e463 fixed 'help for keyboard users' 2019-09-12 22:50:01 +02:00
Zeno Rogue
79f36c6f49 2d3d:: fixed displaying other selves in shmup 2019-09-12 22:49:56 +02:00
Zeno Rogue
221ba3f01d racing:: disabled rotation with mouse in 2D3D 2019-09-12 22:49:55 +02:00
Zeno Rogue
7669633fbf no godir change if no movement (just in case) 2019-09-12 22:49:55 +02:00
Zeno Rogue
5fbdeaa89d 2d3d:: inertia movement now takes rotation into account 2019-09-12 22:49:48 +02:00
Zeno Rogue
6ba308cac5 2d3d:: monster at's are now fixed to 2D in all geometries (including virtual rebasing) 2019-09-12 22:49:47 +02:00
Zeno Rogue
7ce12ef63b factored 'addradar' function 2019-09-12 22:49:44 +02:00