1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 05:17:17 +00:00
Commit Graph

2413 Commits

Author SHA1 Message Date
Arthur O'Dwyer
ac37e5c000 Get hyper_function.h compiling on GCC 4.6.
We must avoid the following features:
- the `using` syntax for typedefs
- alias templates (so, rename `hyper_function` to `function`)
- the `override` keyword
- defaulted virtual destructors
2019-02-10 15:54:58 -05:00
Arthur O'Dwyer
5efd1f5662 Fix a compiler warning from GCC 4.6.4.
The variable name in this warning is "pre-phi-tmp", as in, some
compiler internals spilling into userspace. But I think it's probably
referring to `bestV`, and indeed, this initialization silences the
warning.

    geometry2.cpp: In function ‘void hr::virtualRebaseSimple(hr::heptagon*&, hr::transmatrix&)’:
    geometry2.cpp:366:7: error: ‘prephitmp.91209’ may be used uninitialized in this function [-Werror=uninitialized]
2019-02-10 15:51:27 -05:00
Arthur O'Dwyer
5e8d03e90d Add GCC 4.6 to the TravisCI build.
With `-march=native`, we see assembler error messages like those described
in https://github.com/uzh-rpg/rpg_svo/issues/7 .
2019-02-10 14:51:21 -05:00
Zeno Rogue
6e94dbf674 added ignore to fscanf 2019-02-10 14:58:41 +01:00
Zeno Rogue
79bb11413c rogueviz:: added cvl 2019-02-10 10:43:51 +01:00
Zeno Rogue
bcbacf5b68 fixed minemark help 2019-02-09 21:02:43 +01:00
Zeno Rogue
b254776243 fixed hotkey clash in take shot -> hide the player 2019-02-09 15:07:17 +01:00
Zeno Rogue
513af4c7b4 Merge branch 'master' of https://github.com/zenorogue/hyperrogue into free 2019-02-09 14:23:01 +01:00
Zeno Rogue
a876f206f6 shapes work correctly with CAP_EDIT off 2019-02-09 14:22:05 +01:00
?
2dcf1a2318 Merge https://github.com/zenorogue/hyperrogue into free 2019-02-09 13:30:25 +01:00
Zeno Rogue
649ba86a8e fixed hotkey clash 2019-02-09 13:28:13 +01:00
Zeno Rogue
a0ac77b07b moved 6789l between pattern sub-menus 2019-02-09 13:21:49 +01:00
?
d419d15a87 Merge branch 'free' of /home/eryx/proj/rogue/hyper/hg into free 2019-02-09 12:55:23 +01:00
Zeno Rogue
f07d406b0f allowChangeRange() used where it should 2019-02-09 12:50:34 +01:00
Zeno Rogue
daf99f6a44 back button in pattern selector 2019-02-09 12:50:34 +01:00
Zeno Rogue
075ab6f1e8 allowChangeRange() used where it should 2019-02-09 12:49:53 +01:00
Zeno Rogue
0028438a8d back button in pattern selector 2019-02-09 12:49:53 +01:00
Zeno Rogue
6642ebf0c5
Merge pull request #74 from Quuxplusone/macros
Rearrange some macros. No functional change intended.
2019-02-09 12:46:32 +01:00
Arthur O'Dwyer
9471ac4ff5 Rearrange some macros. No functional change intended. 2019-02-08 18:18:56 -05:00
?
17fbd46352 added info to changelog 2019-02-08 18:06:51 +01:00
?
a2c46eacc4 fixed unused variables 2019-02-08 18:05:57 +01:00
?
162542b616 parts pushed too fast 2019-02-08 17:39:46 +01:00
Zeno Rogue
458b3f5dae Orb of Air now affects boats, statues, thumpers, and barrels 2019-02-08 17:07:07 +01:00
Zeno Rogue
f546bba84a fixes for mobile 2019-02-08 16:57:19 +01:00
Zeno Rogue
13c60727cd logs loaded for the inventory mode are now recognized correctly 2019-02-08 16:57:19 +01:00
Zeno Rogue
36034a1514 fixed some lands generating incorrectly 2019-02-08 16:56:23 +01:00
Zeno Rogue
6abb527854 added missing CAP_TEXTURE guards 2019-02-08 16:55:35 +01:00
Zeno Rogue
b8990890d7 rogueviz:: added rogueviz-magiccube 2019-02-08 16:55:00 +01:00
Zeno Rogue
fd9fca6129 redesigned the Experiment with Geometry menu 2019-02-08 16:55:00 +01:00
Zeno Rogue
5227a5a70e inv:: fixed hotkeys 2019-02-08 16:54:33 +01:00
Zeno Rogue
8a18dd3c1c formula works in spherical geometry 2019-02-08 16:51:50 +01:00
Zeno Rogue
2a7dea4788 no more mobile compass by default in mobile 2019-02-08 16:51:50 +01:00
Zeno Rogue
8426007577 fixed incorrect mouse interpretation in models 2019-02-06 22:42:11 +01:00
Zeno Rogue
1d468b1685 changed the priority of MFloor to FLOOR_DRAGON 2019-02-06 22:42:11 +01:00
Zeno Rogue
9ebd5342ec fixed a freeze in spherical Dungeon 2019-02-06 22:42:11 +01:00
Zeno Rogue
381071ab4c 10.5e loads the 11.0e format 2019-02-06 18:54:29 +01:00
Zeno Rogue
952f1c44fe minor fixes to color handling 2019-02-06 18:54:29 +01:00
Charlène
9cee52cf81 Fix colors for big endian architectures. 2019-02-06 18:50:36 +01:00
Arthur O'Dwyer
87240cf990 Replace std::function with hyper_function for a 37% speedup in compile time.
Before:

    time c++ -O2 -DMAC -I/usr/local/include -std=c++11 -march=native
             -W -Wall -Wextra -Werror -pedantic -Wno-format-pedantic
             -Wno-missing-field-initializers -Wno-unused-parameter
             -DCAP_GLEW=0 -DCAP_PNG=0    -c hyper.cpp -o hyper.o

    real 2m22.508s
    user 2m20.625s
    sys  0m1.648s

After:

    time c++ -O2 -DMAC -I/usr/local/include -std=c++11 -march=native
             -W -Wall -Wextra -Werror -pedantic -Wno-format-pedantic
             -Wno-missing-field-initializers -Wno-unused-parameter
             -DCAP_GLEW=0 -DCAP_PNG=0    -c hyper.cpp -o hyper.o

    real 1m30.515s
    user 1m29.793s
    sys  0m0.689s

Comparing object file size:

    -rw-r--r--  1 ajo  staff  8215036 Jan  5 20:46 old-hyper.o
    -rw-r--r--  1 ajo  staff  7538072 Jan  5 20:47 new-hyper.o

Comparing number of symbols:

    nm old-hyper.o | wc -l  => 12590
    nm new-hyper.o | wc -l  =>  9742

No appreciable difference in link time; the linker takes less than
half a second in either case.
2019-02-06 18:48:53 +01:00
Arthur O'Dwyer
a478bb1485 Fix some minor std::function-related bugs.
Lambdas to be stored in `function<void()>` should not return `bool`.

Two uses of `std::function` could be just `function`, like everywhere
else in the codebase.
2019-02-06 18:48:53 +01:00
Zeno Rogue
26fe57ef92 mapeditor:: an option to change new canvas cells without clearing the map 2019-02-06 18:48:53 +01:00
Zeno Rogue
44c3e2eb0a mapeditor:: no more crashing on 'c'opying outside of map 2019-02-06 18:48:53 +01:00
Zeno Rogue
9c47d67b89 fixed obsolete Bomberbird Egg reveal description 2019-02-06 18:48:53 +01:00
Zeno Rogue
94ce1eb541 fixed_facing option, not only in racing 2019-02-06 18:48:53 +01:00
Zeno Rogue
92d98847fb fixed the issue with Orb of Aether being marked as used due to Minefield uncovering 2019-02-06 18:48:53 +01:00
Zeno Rogue
41ee2f4a7c mapeditor saves color_formula 2019-02-06 18:48:53 +01:00
Zeno Rogue
daf9a5906a mapeditor:: save more data: multiplayer positions, rosewaves, turncount (ocean waves), mutant ivy phase 2019-02-06 18:48:53 +01:00
Zeno Rogue
34256f8d68 wobbling added to moving humanoid characters 2019-02-06 18:48:53 +01:00
Zeno Rogue
730e7b5b99 number editor now accepts hex numbers, and uses hex as default when editing Tortoises 2019-02-06 18:48:53 +01:00
Zeno Rogue
35043b5528 tortoise flags are now editable with Shift+G and saved into saved levels 2019-02-06 18:48:53 +01:00