Fix more stuff

This commit is contained in:
Lwmte 2021-09-16 01:12:19 +03:00
parent 09f3f72497
commit 2b49b9aa42
41 changed files with 427 additions and 430 deletions

View file

@ -1,16 +1,10 @@
#include "framework.h"
#include "GameFlowScript.h"
#include "items.h"
#include "box.h"
#include "lot.h"
#include "Sound\sound.h"
#include "Sound/sound.h"
#include "savegame.h"
#include "draw.h"
#include "AudioTracks.h"
#include "GameScriptInventoryObject.h"
#include "InventorySlots.h"
#include <Objects/objectslist.h>
#include <Game/newinv2.h>
#include "Game/newinv2.h"
/***
Scripts that will be run on game startup.
@ -22,7 +16,8 @@ using std::string;
using std::vector;
using std::unordered_map;
extern unordered_map<string, AudioTrack> SoundTracks;
GameFlow* g_GameFlow;
GameScript* g_GameScript;
GameFlow::GameFlow(sol::state* lua) : LuaHandler{ lua }
{
@ -308,6 +303,4 @@ bool GameFlow::DoGameflow()
}
return true;
}
GameFlow* g_GameFlow;
}