1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-25 19:07:40 +00:00

further cleanup

This commit is contained in:
Zeno Rogue
2019-08-09 23:39:36 +02:00
parent 65c4e6a31c
commit a76a5dd265
12 changed files with 33 additions and 125 deletions

97
hyper.h
View File

@@ -1455,39 +1455,14 @@ namespace mapeditor {
inline string pick123() { return cts('1' + rand() % 3); }
inline string pick12() { return cts('1' + rand() % 2); }
extern int lowfar;
extern int maxreclevel, reclevel;
extern int detaillevel;
extern bool quitmainloop;
enum eGravity { gsNormal, gsLevitation, gsAnti };
extern eGravity gravity_state, last_gravity_state;
int gravityLevel(cell *c);
int gravityLevelDiff(cell *c, cell *f);
void fullcenter();
void movecost(cell* from, cell *to, int phase); // 1 = pre-collect, 2 = post-collect, 3 = both
void checkmove();
transmatrix eumove(ld x, ld y);
transmatrix eumove(int vec);
transmatrix eumovedir(int d);
int reptilemax();
extern bool mousing;
#define IFM(x) (mousing?"":x)
extern cellwalker recallCell;
extern eLand cheatdest;
void cheatMoveTo(eLand l);
void doOvergenerate();
void collectMessage(cell *c2, eItem which);
namespace quotientspace {
void build();
void clear();
@@ -1717,10 +1692,6 @@ namespace linepatterns {
static const int DISTANCE_UNKNOWN = 127;
transmatrix atscreenpos(ld x, ld y, ld size);
hyperpoint mirrorif(const hyperpoint& V, bool b);
#define SETMOUSEKEY 5000
extern char mousekey;
extern char newmousekey;
@@ -1728,14 +1699,6 @@ void displaymm(char c, int x, int y, int rad, int size, const string& title, int
template<class T, class... U> T pick(T x, U... u) { std::initializer_list<T> i = {x,u...}; return *(i.begin() + hrand(1+sizeof...(u))); }
int darkenedby(int c, int lev);
extern ld mouseaim_sensitivity;
string generateHelpForItem(eItem it);
bool graphglyph();
extern bool hiliteclick;
extern int antialiaslines;
extern color_t ringcolor, periodcolor, modelcolor, stdgridcolor;
#include <functional>
template<class T, class U> int addHook(hookset<T>*& m, int prio, const U& hook) {
@@ -1840,8 +1803,6 @@ namespace windmap {
}
#endif
extern int wavephase;
int getgametime();
string getgametime_s(int timespent = getgametime());
extern int stampbase;
@@ -2206,68 +2167,10 @@ struct land_validity_t {
string msg;
};
extern vector<eLand> landlist;
template<class T> void generateLandList(T t);
land_validity_t& land_validity(eLand l);
bool isLandIngame(eLand l);
bool inmirrororwall(eLand l);
extern bool holdmouse;
// what part of the compass does 'skip turn'
static const auto SKIPFAC = .4;
bool haveMobileCompass();
bool handleCompass();
inline bool sphereflipped() { return sphere && vid.alpha > 1.1 && DIM == 3; }
int cellcolor(cell *c);
extern ld backbrightness;
void initcells();
extern const hyperpoint C02, C03;
#define C0 (DIM == 2 ? C02 : C03)
extern long long circlesize[100], disksize[100];
extern ld circlesizeD[10000];
void computeSizes();
#if CAP_FILES
extern const char *scorefile;
extern const char *conffile;
extern string levelfile;
extern string picfile;
extern const char *musicfile;
extern const char *loadlevel;
#endif
extern bool fixseed;
extern eLand firstland0;
extern int startseed;
// heptspin hsstep(const heptspin &hs, int spin);
ld hdist0(const hyperpoint& mh);
extern bool fading;
extern ld fadeout;
int itemclass(eItem i);
int monsterclass(eMonster m);
extern purehookset hooks_drawmap;
extern hookset<bool(eLand&)> *hooks_music;
extern hookset<bool()> *hooks_prestats;
extern purehookset hooks_fixticks;
void sdltogl(SDL_Surface *txt, struct glfont_t& f, int ch);
void showStartMenu();
bool polara50(int x);
bool polara50(cell *c);
int fiftyval049(cell *c);
namespace fieldpattern {
pair<int, bool> fieldval(cell *c);
}