summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-02-16 18:08:19 +0200
committerSergeanur <s.anureev@yandex.ua>2021-02-16 18:08:19 +0200
commite38467ef3affef25b83daf0c0c3b8a61f04e8a65 (patch)
tree3628aed1314f21147e7a46f3095fa341088d8044 /src/text
parent78f4e8fdcab597e2fadfa605c351486663f96a14 (diff)
parentb451be6c7f354c5faef204085402ee19a5dd4d44 (diff)
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt
Diffstat (limited to 'src/text')
-rw-r--r--src/text/Text.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 16250f79..ad512104 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -9,7 +9,7 @@
#include "Text.h"
#include "Timer.h"
-static wchar WideErrorString[25];
+wchar WideErrorString[25];
CText *CText::msInstance = nil;