1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 01:50:36 +00:00
Commit Graph

5461 Commits

Author SHA1 Message Date
Arthur O'Dwyer
14c098eaf9 Add whitespace to silence Clang's -Wmisleading-indentation. NFC.
./fieldpattern.cpp:440:5: error: misleading indentation;
    statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
        if(isize(res) > limitp) return res;
        ^
2020-03-23 15:07:46 -04:00
Arthur O'Dwyer
f49c57c4f0 Fix a bug found by Clang's -Wtautological-overlap-compare.
./help.cpp:880:89: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
        if(!((c->wall == waCavefloor || c->wall == waCavewall) && (c->land == laEmerald && c->land == laCaves)))
                                                                   ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~
2020-03-23 14:48:56 -04:00
Arthur O'Dwyer
5cc8a41beb Turn C-style casts into reinterpret_casts for clarity. NFC. 2020-03-23 14:48:41 -04:00
Arthur O'Dwyer
2461b29ea2 Include <sstream> for the benefit of "hprint.cpp". 2020-03-23 14:45:59 -04:00
Arthur O'Dwyer
af69faa646 Fix a harmless misuse of DEBBI. 2020-03-23 14:39:30 -04:00
Arthur O'Dwyer
b450ca1596 Add -pedantic to the compiler options, and clean up some cruft. 2020-03-23 14:39:30 -04: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
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
Arthur O'Dwyer
561a3ebade Silence a pedantic GCC warning by adding reinterpret_cast<void*>.
Here we're casting a function pointer to `void*`, which is not doable
with our implicit-conversions-only `hr::voidp(x)` helper, and is
not even doable with a `static_cast`; we must `reinterpret_cast`.
2020-03-23 14:39:30 -04:00
Arthur O'Dwyer
7a706478dc Add a helper function voidp to silence GCC warnings about %p.
We must fully qualify calls to `hr::voidp` because the expression
`voidp(x)` is ambiguous or worse. "/usr/include/zconf.h" defines
`voidp` in the global namespace as a typedef for `void*`.
We don't want an unsafe functional-style cast to `void*`;
we want to call our nice safe helper function. So we qualify the name.
2020-03-23 14:39:28 -04:00
Arthur O'Dwyer
13bf666e29 Lambdas can't have default arguments until C++14.
Arguably this is a reason to upgrade from C++11 to C++14,
or to give up completely on `-pedantic`, but I think it's
easy enough to eliminate these few nits.
2020-03-23 14:38:57 -04:00
Arthur O'Dwyer
41669ab720 Eliminate -Wmissing-field-initializers warnings. 2020-03-23 14:38:57 -04:00
Arthur O'Dwyer
a0da10b408 Remove extraneous semicolons to quiet pedantic GCC warnings. 2020-03-23 14:38:57 -04:00
Zeno Rogue
14d2237c01 11.3e 2020-03-22 12:03:09 +01:00
Zeno Rogue
8aaeb4ea69 sight range changing no longer considered cheating in arb 2020-03-22 12:02:58 +01:00
Zeno Rogue
3bc2a8447a new tessellations 2020-03-22 11:43:31 +01:00
Zeno Rogue
e55289e317 exp_parser:: replaced 'return' to 'res = ' (allows adding etc.), changed useless 'cld = rparse' to 'ld = rparse' 2020-03-22 11:27:59 +01:00
Zeno Rogue
32c6228319 arb:: utilities for making Archimedean tilings 2020-03-22 11:27:06 +01:00
Zeno Rogue
3b5e31156d arb:: a bit nicer 2020-03-22 10:15:57 +01:00
Zeno Rogue
0153cb905a fixed a bug in some spherical tilings 2020-03-22 10:15:03 +01:00
Zeno Rogue
b2a6ae304d fixed a bug in loading maps from old versions 2020-03-22 09:48:24 +01:00
Zeno Rogue
aa8906d6dd added some documentation 2020-03-22 09:47:56 +01:00
Zeno Rogue
f1d84c248e added documentation for changes_t 2020-03-22 09:47:13 +01:00
Zeno Rogue
d9b1461c81 tortoise:: moving over other tortoises no longer clones them 2020-03-22 09:46:51 +01:00
Zeno Rogue
11447fcb7b tortoise:: shading now can be disabled 2020-03-22 09:46:13 +01:00
Zeno Rogue
33bacc8731 updated version and documentation link in README 2020-03-22 00:24:52 +01:00
Zeno Rogue
85e6be8cab do not reset whichShape to 0 in special geometries 2020-03-21 19:06:54 +01:00
Zeno Rogue
862d2c7e65 exporting arb::load 2020-03-21 19:05:44 +01:00
Zeno Rogue
c3fdc34f7c fixed CAP_RAY guards 2020-03-21 19:05:17 +01:00
Zeno Rogue
02112cb636 CLI option -precw 2020-03-21 19:04:23 +01:00
Zeno Rogue
64c63b7899 CAP_RAY 2020-03-21 10:49:07 +01:00
Zeno Rogue
c131ed52ad fixed the Slime cheese in the Wetland 2020-03-21 10:37:00 +01:00
Zeno Rogue
e21cbbd207 rogueviz:: export createViz 2020-03-21 10:15:11 +01:00
Zeno Rogue
e70915de9d fixed distance computation in 3D fieldquotient 2020-03-21 10:14:54 +01:00
Zeno Rogue
7096d152be product:: shmup:: monsters rotate correctly 2020-03-21 09:35:54 +01:00
Zeno Rogue
2cc1de4a02 flocking:: product geometries 2020-03-21 09:34:50 +01:00
Zeno Rogue
e3a1079a32 kohonen:: no longer display rings in 3D if we are not in Kohonen 2020-03-21 09:34:04 +01:00
Zeno Rogue
c91209620e fire-related orbs are now useless in Wetland 2020-03-21 09:32:28 +01:00
Zeno Rogue
766c7389d5 Orb of the Fish is no longer useless in Wetland and Frog Park 2020-03-21 09:29:32 +01:00
Zeno Rogue
0d5625221e product: fixed hpxy in S2xE -- the bug caused asymmetric models 2020-03-21 09:29:08 +01:00
Zeno Rogue
5bd291784b kite:: sidewalls were not arranged correctly 2020-03-21 09:28:16 +01:00
Zeno Rogue
4e52804d45 moved spin_to and spin_from implementations outside of hr_map 2020-03-21 09:27:12 +01:00
Zeno Rogue
1bf12411bb flocking:: -flockspd option 2020-03-20 19:50:23 +01:00
Zeno Rogue
c66fbe9ea0 flocking:: prevent crash in follow=2 when no boids found 2020-03-20 19:50:15 +01:00
Zeno Rogue
7449a48198 flocking:: nonisotropic 2020-03-20 19:49:59 +01:00
Zeno Rogue
8503104470 flocking:: updated the comment 2020-03-20 19:48:21 +01:00
Zeno Rogue
1d76e455e1 fixed some errors 2020-03-17 03:44:35 +01:00
Zeno Rogue
808bbe05a0 11.3d 2020-03-16 21:48:03 +01:00
Zeno Rogue
269ff6c74f fixed the missing messages (and click sound) when interacting with Orb of Yendor 2020-03-16 21:42:26 +01:00
Zeno Rogue
bd065c3e90 changes: you no longer immediately die in LoEM 2020-03-16 21:40:27 +01:00