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

Merge remote-tracking branch 'origin/lara_info'

Browse source 
# Conflicts:
#	TR5Main/Game/Lara/lara_flare.h
#	TR5Main/Scripting/GameLogicScript.cpp
This commit is contained in:
MontyTRC89 2021-07-14 05:48:42 +02:00
commit 916d22759b
24 changed files with 375 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -15,6 +15,10 @@
#include <iostream>
#include "InventorySlots.h"
#ifndef _DEBUG
#include <iostream>
#endif
extern GameFlow* g_GameFlow;
GameScript* g_GameScript;
extern bool const WarningsAsErrors = true;