mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

improved ISMINI; always_false

This commit is contained in:
? 2019-02-17 18:50:56 +01:00 committed by Zeno Rogue
parent e44de82394
commit 183b267d64
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hyper.h
View File

@ -11,6 +11,11 @@
namespace hr { namespace hr {
struct always_false {
operator bool() const { return false; };
void operator = (bool b) const {};
};
template<class T> template<class T>
void ignore(T&&) { void ignore(T&&) {
// placate GCC's overzealous -Wunused-result // placate GCC's overzealous -Wunused-result
@ -2273,6 +2278,10 @@ namespace tour {
extern hookset<void(int)> *hooks_slide; extern hookset<void(int)> *hooks_slide;
}; };
#else
namespace tour {
static const always_false on;
}
#endif #endif
extern bool doCross; extern bool doCross;

8
sysconfig.h
View File

@ -77,15 +77,15 @@
#endif #endif
#ifndef CAP_ANIMATIONS #ifndef CAP_ANIMATIONS
#define CAP_ANIMATIONS (!CAP_MINI) #define CAP_ANIMATIONS (!ISMINI)
#endif #endif
#ifndef CAP_FILES #ifndef CAP_FILES
#define CAP_FILES 1 #define CAP_FILES (!ISMINI)
#endif #endif
#ifndef CAP_INV #ifndef CAP_INV
#define CAP_INV 1 #define CAP_INV (!ISMINI)
#endif #endif
#ifndef CAP_ANDROIDSHARE #ifndef CAP_ANDROIDSHARE
@ -197,7 +197,7 @@
#define CAP_SDLAUDIO (CAP_SDL && CAP_AUDIO) #define CAP_SDLAUDIO (CAP_SDL && CAP_AUDIO)
#ifndef CAP_SVG #ifndef CAP_SVG
#define CAP_SVG (!ISMOBILE) #define CAP_SVG (CAP_FILES && !ISMOBILE && !ISMINI)
#endif #endif
#ifndef CAP_POLY #ifndef CAP_POLY