mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-18 11:19:59 +00:00
Code Issues Releases Wiki Activity

header cleanup Yendor

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-10 01:20:47 +02:00
parent 4ec7652861
commit b0f2e7b6b9
2 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hyper.h
View File

@ -1691,44 +1691,6 @@ const eLand NOWALLSEP_USED = laWhirlpool;
#define HAUNTED_RADIUS getDistLimit()
#define UNKNOWN 65535
namespace tactic {
extern bool on;
extern bool trailer;
}
namespace yendor {
extern bool on;
extern bool generating;
extern eLand nexttostart;
#define YF_DEAD 1
#define YF_WALLS 2
#define YF_END 4
#define YF_DEAD5 8
#define YF_NEAR_IVY 16
#define YF_NEAR_ELEM 32
#define YF_NEAR_OVER 64
#define YF_NEAR_RED 128
#define YF_REPEAT 512
#define YF_NEAR_TENT 1024
#define YF_START_AL 2048
#define YF_START_CR 4096
#define YF_CHAOS 8192
#define YF_RECALL 16384
#define YF_NEAR_FJORD 32768
#define YF_START_ANY (YF_START_AL|YF_START_CR)
struct yendorlevel {
eLand l;
int flags;
};
yendorlevel& clev();
}
namespace clearing {
struct clearingdata {
@ -1741,10 +1703,6 @@ namespace clearing {
extern std::map<heptagon*, clearingdata> bpdata;
}
namespace peace {
extern bool on;
}
namespace princess {
#define EPX 39
#define EPY 21

49
yendor.cpp
View File

@ -35,10 +35,10 @@ void displayScore(subscoreboard& s, int x) {
}
}
namespace yendor {
EX namespace yendor {
bool on = false;
bool generating = false;
EX bool on = false;
EX bool generating = false;
bool path = false;
bool everwon = false;
bool won = false;
@ -47,11 +47,38 @@ namespace yendor {
int challenge; // id of the challenge
int lastchallenge;
#if HDR
#define YF_DEAD 1
#define YF_WALLS 2
#define YF_END 4
#define YF_DEAD5 8
#define YF_NEAR_IVY 16
#define YF_NEAR_ELEM 32
#define YF_NEAR_OVER 64
#define YF_NEAR_RED 128
#define YF_REPEAT 512
#define YF_NEAR_TENT 1024
#define YF_START_AL 2048
#define YF_START_CR 4096
#define YF_CHAOS 8192
#define YF_RECALL 16384
#define YF_NEAR_FJORD 32768
#define YF_START_ANY (YF_START_AL|YF_START_CR)
struct yendorlevel {
eLand l;
int flags;
};
#endif
#define YENDORLEVELS 33
map<modecode_t, array<int, YENDORLEVELS>> bestscore;
eLand nexttostart;
EX eLand nexttostart;
#define LAND_YENDOR_CHAOS 41
@ -745,13 +772,13 @@ namespace yendor {
return false;
});
});
};
EX }
#define MAXTAC 20
namespace tactic {
EX namespace tactic {
bool trailer = false;
bool on = false;
EX bool trailer = false;
EX bool on = false;
int id;
map<modecode_t, array<int, landtypes>> recordsum;
@ -962,7 +989,7 @@ namespace tactic {
};
}
};
EX }
// Identifiers for the current combinations of game modes
// These are recorded in the save file, so it is somewhat
@ -1128,9 +1155,9 @@ int modecode() {
return mct;
}
namespace peace {
EX namespace peace {
bool on = false;
EX bool on = false;
bool hint = false;
bool otherpuzzles;