Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 00:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed std namespace collisions

Browse source 
Refactored ChunkID/ChunkReader/Writer
This commit is contained in:
Raildex 2020-06-20 23:39:08 +02:00
parent 820a3700b0
commit b635f4df13
47 changed files with 589 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TR5Main/Scripting/GameFlowScript.cpp
View file

@ -6,7 +6,8 @@
#include "sound.h"
#include "savegame.h"
#include "draw.h"
using std::string;
using std::vector;
ChunkId* ChunkGameFlowFlags = ChunkId::FromString("Tr5MainFlags");
ChunkId* ChunkGameFlowLevel = ChunkId::FromString("Tr5MainLevel");
ChunkId* ChunkGameFlowLevelFlags = ChunkId::FromString("Tr5MainLevelFlags");
@ -328,6 +329,8 @@ bool __cdecl LoadScript()
string GameFlow::loadScriptFromFile(char* luaFilename)
{
using std::ifstream;
using std::ios;
ifstream ifs(luaFilename, ios::in | ios::binary | ios::ate);
ifstream::pos_type fileSize = ifs.tellg();