Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-01 09:18:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolving namespace std conflicts

Browse source
This commit is contained in:
Raildex 2020-06-18 15:54:08 +02:00
parent a4e4bd702d
commit 2b4d1ca2e8
25 changed files with 233 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TR5Main/Scripting/LanguageScript.h
View file

@ -1,6 +1,6 @@
#pragma once
// Define string ids
// Define std::string ids
#define STRING_PASSPORT 1
#define STRING_LARA_HOME 2
#define STRING_CONTROLS 3
@ -104,8 +104,8 @@
class LanguageScript
{
public:
string Name;
vector<string> Strings;
std::string Name;
std::vector<std::string> Strings;
LanguageScript(char* name);
~LanguageScript();