Merge branch 'master' into scripting

This commit is contained in:
MontyTRC 2020-04-30 21:52:16 +02:00 committed by GitHub
commit 6b16828381
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
232 changed files with 11849 additions and 9250 deletions

View file

@ -1,9 +1,12 @@
#include "GameLogicScript.h"
#include "..\Game\items.h"
#include "..\Game\box.h"
#include "..\Game\lara.h"
#include "../Game/savegame.h"
#include "..\Game\lot.h"
#include "..\Game\sound.h"
#include "../Specific/setup.h"
#include "../Specific/level.h"
extern GameFlow* g_GameFlow;
GameScript* g_GameScript;