1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00

namespaces conform to an older standard

This commit is contained in:
Zeno Rogue 2018-06-11 18:00:40 +02:00
parent 7d04f92b55
commit a40d64a8f6
11 changed files with 21 additions and 23 deletions

View File

@ -102,7 +102,7 @@ bool inv::activating;
#if CAP_DAILY
#include "private/daily.cpp"
#else
namespace hr::daily { bool on; }
namespace hr { namespace daily { bool on; } }
#endif
#endif

View File

@ -1,4 +1,4 @@
namespace hr::gp {
namespace hr { namespace gp {
bool on;
loc param(1, 0);
@ -733,5 +733,4 @@ namespace hr::gp {
return dist_3() - dist_2();
}
}
}}

View File

@ -1,7 +1,7 @@
// Hyperbolic Rogue -- Orb Strategy Mode
// Copyright (C) 2011-2018 Zeno Rogue, see 'hyper.cpp' for details
namespace hr::inv {
namespace hr { namespace inv {
bool on;
array<int, ittypes> usedup;
@ -645,6 +645,6 @@ namespace hr::inv {
}
}
}
}}

View File

@ -2,7 +2,7 @@
// Copyright (C) 2011-2018 Zeno Rogue, see 'hyper.cpp' for details
#if CAP_MODEL
namespace hr::netgen {
namespace hr { namespace netgen {
// We need a two-dimensional vector class for this.
@ -713,5 +713,5 @@ namespace hr::netgen {
else
pushScreen(show);
}
}
}}
#endif

View File

@ -4,7 +4,7 @@
// good parameters: -fixx 10 -W Cros -bantar_anim
// use -bantar_map to see how it works
namespace rogueviz::banachtarski {
namespace rogueviz { namespace banachtarski {
bool on;
@ -518,5 +518,4 @@ auto hook = addHook(hooks_args, 100, readArgs)
+ addHook(hooks_initgame, 100, bantar)
+ addHook(hooks_frame, 100, bantar_stats);
}
}}

View File

@ -4,7 +4,7 @@
// Kohonen's self-organizing networks.
// This is a part of RogueViz, not a part of HyperRogue.
namespace rogueviz::kohonen {
namespace rogueviz { namespace kohonen {
int cols;
@ -1131,4 +1131,4 @@ void rogueviz::mark(cell *c) {
distfrom = getNeuronSlow(c);
coloring();
}
}
}}

View File

@ -4,7 +4,7 @@
// Kohonen's self-organizing networks.
// This is a part of RogueViz, not a part of HyperRogue.
namespace rogueviz::staircase {
namespace rogueviz { namespace staircase {
using namespace hyperpoint_vec;
@ -306,4 +306,4 @@ int readArgs() {
int phooks = addHook(hooks_args, 100, readArgs)
+ addHook(hooks_fixticks, 100, check);
}
}}

View File

@ -3,7 +3,7 @@
#if CAP_SAVE
namespace hr::scores {
namespace hr { namespace scores {
vector<score> scores;
score *currentgame;
@ -338,7 +338,7 @@ void load() {
});
}
}
}}
#endif

View File

@ -4,7 +4,7 @@
// See http://webmath2.unito.it/paginepersonali/sergio.console/CurveSuperfici/AG15.pdf for a nice reference
#if CAP_SURFACE
namespace hr::surface {
namespace hr { namespace surface {
using namespace hyperpoint_vec;
@ -829,5 +829,5 @@ void display_coverage() {
auto surface_hook2 = addHook(hooks_frame, 0, display_coverage);
}
}}
#endif

View File

@ -8,7 +8,7 @@
#endif
#if CAP_TEXTURE
namespace hr::texture {
namespace hr { namespace texture {
cpatterntype cgroup;
@ -1527,5 +1527,5 @@ void texture_data::update() {
}
}
}
}}
#endif

View File

@ -1,7 +1,7 @@
// Hyperbolic Rogue -- the Tutorial/presentation
// Copyright (C) 2011-2018 Zeno Rogue, see 'hyper.cpp' for details
namespace hr::tour {
namespace hr { namespace tour {
bool on;
@ -803,4 +803,4 @@ auto a1 = addHook(hooks_frame, 100, [] () { if(tour::on) tour::presentation(tour
auto a2 = addHook(hooks_handleKey, 100, handleKeyTour);
auto a3 = addHook(hooks_nextland, 100, [] (eLand l) { return tour::on ? getNext(l) : laNone; });
}
}}