eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 04:39:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into dev

Browse Source
This commit is contained in:
milek7
2017-12-25 18:27:10 +01:00
parent 0aaeda576e 1b5e6aafd1
commit a215a0f8b3
65 changed files with 5288 additions and 4558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
EU07.cpp
View File

@@ -25,6 +25,9 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#include "Globals.h"
#include "Timer.h"
#include "Logs.h"
#include "renderer.h"
#include "uilayer.h"
#include "audiorenderer.h"
#include "keyboardinput.h"
#include "mouseinput.h"
#include "gamepadinput.h"
@@ -49,7 +52,6 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
#endif
std::unique_ptr<sound_manager> sound_man;
TWorld World;
namespace input {
@@ -346,10 +348,9 @@ int main(int argc, char *argv[])
|| (false == UILayer.init(window)))
return -1;
sound_man = std::make_unique<sound_manager>();
Global::pWorld = &World;
audio::renderer.init();
input::Keyboard.init();
input::Mouse.init();
input::Gamepad.init();