games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge pull request #6278 from IvanSavenko/cpp20

Browse Source 
Migrate codebase to C++20
This commit is contained in:
Ivan Savenko
2025-11-23 18:42:44 +02:00
committed by GitHub
parent 36f2794857 cf378c3672
commit 9ef0646aaf
13 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mapView/MapRendererContext.h
View File

@@ -13,10 +13,7 @@
#include "../lib/GameConstants.h"
#include "../lib/int3.h"
VCMI_LIB_NAMESPACE_BEGIN
struct ObjectPosInfo;
VCMI_LIB_NAMESPACE_END
#include "../lib/spells/ViewSpellInt.h"
struct MapRendererContextState;

4
client/renderSDL/FontChain.cpp
View File

@@ -115,8 +115,8 @@ size_t FontChain::getGlyphWidthScaled(const char * data) const
std::vector<FontChain::TextChunk> FontChain::splitTextToChunks(const std::string & data) const
{
// U+FFFD - replacement character (question mark in rhombus)
static const std::string replacementCharacter = u8"�";
// U+FFFD - replacement character (question mark in rhombus, '�')
static const std::string replacementCharacter = reinterpret_cast<const char *>(u8"\ufffd");
std::vector<TextChunk> chunks;

5
client/windows/CQuestLog.h
View File

@@ -9,11 +9,14 @@
*/
#pragma once
#include "CWindowObject.h"
#include "../widgets/TextControls.h"
#include "../widgets/MiscWidgets.h"
#include "../widgets/Images.h"
#include "../adventureMap/CMinimap.h"
#include "CWindowObject.h"
#include "../../lib/gameState/QuestInfo.h"
VCMI_LIB_NAMESPACE_BEGIN