mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-21 00:19:29 +02:00
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
# Conflicts: # lib/Terrain.cpp # lib/Terrain.h # lib/battle/CBattleInfoEssentials.cpp # lib/rmg/ObstaclePlacer.cpp # lib/rmg/RiverPlacer.cpp
This commit is contained in:
@ -19,6 +19,8 @@
|
||||
#include "VCMI_Lib.h"
|
||||
#include "Terrain.h"
|
||||
|
||||
VCMI_LIB_NAMESPACE_BEGIN
|
||||
|
||||
size_t Unicode::getCharacterSize(char firstByte)
|
||||
{
|
||||
// length of utf-8 character can be determined from 1st byte by counting number of highest bits set to 1:
|
||||
@ -519,3 +521,5 @@ int32_t CGeneralTextHandler::pluralText(const int32_t textIndex, const int32_t c
|
||||
else
|
||||
return textIndex + 1;
|
||||
}
|
||||
|
||||
VCMI_LIB_NAMESPACE_END
|
||||
|
Reference in New Issue
Block a user