Merge branch 'master' into chatter-fixes-and-improvements
This commit is contained in:
commit
332a962ad4
6 changed files with 15 additions and 12 deletions
|
|
@ -447,6 +447,7 @@ constexpr auto kGameMaxPlayers = 32;
|
|||
constexpr auto kGameTeamNum = 2;
|
||||
constexpr auto kInvalidNodeIndex = -1;
|
||||
constexpr auto kGrenadeInventoryEmpty = -1;
|
||||
constexpr auto kInvalidRadioSlot = -1;
|
||||
constexpr auto kConfigExtension = "cfg";
|
||||
|
||||
// weapon masks
|
||||
|
|
|
|||
|
|
@ -268,8 +268,8 @@ public:
|
|||
const IntArray &getNodesInBucket (const Vector &pos);
|
||||
|
||||
public:
|
||||
size_t getMaxRouteLength () const {
|
||||
return m_paths.length () / 2;
|
||||
int32_t getMaxRouteLength () const {
|
||||
return length () / 2;
|
||||
}
|
||||
|
||||
StringRef getAuthor () const {
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ public:
|
|||
m_path[0] = 0;
|
||||
}
|
||||
|
||||
void init (size_t length) {
|
||||
void init (int32_t length) {
|
||||
m_path = cr::makeUnique <int32_t[]> (length);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue