1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-03 19:27:54 +00:00

Make hookset<T> a pointer type, just like purehookset.

No more declaring `hookset<T> *hooks_foo`; now it's just
`hookset<T> hooks_foo` at global scope. This clears the way to
make `hookset<T>` into a class type if we want.
This commit is contained in:
Arthur O'Dwyer
2020-04-11 14:47:14 -04:00
parent 934e3d9a42
commit 0d42168139
23 changed files with 44 additions and 43 deletions

View File

@@ -83,7 +83,7 @@ int musfadeval = 2000;
eLand cid = laNone;
hookset<bool(eLand&)> *hooks_music;
hookset<bool(eLand&)> hooks_music;
bool music_out_of_focus = false;
@@ -129,7 +129,7 @@ EX void handlemusic() {
}
}
hookset<bool(eLand&)> *hooks_resetmusic;
hookset<bool(eLand&)> hooks_resetmusic;
EX void resetmusic() {
if(audio && musicvolume) {
@@ -218,7 +218,7 @@ string wheresounds = SOUNDDESTDIR;
string wheresounds = HYPERPATH "sounds/";
#endif
hookset<bool(const string& s, int vol)> *hooks_sound;
hookset<bool(const string& s, int vol)> hooks_sound;
EX void playSound(cell *c, const string& fname, int vol) {
LATE( hr::playSound(c, fname, vol); )