diff options
| author | 2017-07-07 21:34:15 +0200 | |
|---|---|---|
| committer | 2017-07-07 15:34:15 -0400 | |
| commit | 2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8 (patch) | |
| tree | b5298b3c528d9acc1f3fa48f19c9f9c19c97d036 /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #2814 from Kloen/macro-remove (diff) | |
| download | yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.tar.gz yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.tar.xz yuzu-2e37ce01c9dcdc5932cf5fe47a1ade0e0d2b7cf8.zip | |
Implement basic virtual Room support based on enet (#2803)
* Added support for network with ENet lib,
connecting is possible, but data can't be sent, yet.
* fixup! Added support for network with ENet lib,
* fixup! CLang
* fixup! Added support for network with ENet lib,
* fixup! Added support for network with ENet lib,
* fixup! Clang format
* More fixups!
* Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Clang again
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index a8a4aed8b..30554890f 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "core/settings.h" | 17 | #include "core/settings.h" |
| 18 | #include "input_common/keyboard.h" | 18 | #include "input_common/keyboard.h" |
| 19 | #include "input_common/main.h" | 19 | #include "input_common/main.h" |
| 20 | #include "network/network.h" | ||
| 20 | 21 | ||
| 21 | EmuThread::EmuThread(GRenderWindow* render_window) | 22 | EmuThread::EmuThread(GRenderWindow* render_window) |
| 22 | : exec_step(false), running(false), stop_run(false), render_window(render_window) {} | 23 | : exec_step(false), running(false), stop_run(false), render_window(render_window) {} |
| @@ -110,10 +111,12 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) | |||
| 110 | setWindowTitle(QString::fromStdString(window_title)); | 111 | setWindowTitle(QString::fromStdString(window_title)); |
| 111 | 112 | ||
| 112 | InputCommon::Init(); | 113 | InputCommon::Init(); |
| 114 | Network::Init(); | ||
| 113 | } | 115 | } |
| 114 | 116 | ||
| 115 | GRenderWindow::~GRenderWindow() { | 117 | GRenderWindow::~GRenderWindow() { |
| 116 | InputCommon::Shutdown(); | 118 | InputCommon::Shutdown(); |
| 119 | Network::Shutdown(); | ||
| 117 | } | 120 | } |
| 118 | 121 | ||
| 119 | void GRenderWindow::moveContext() { | 122 | void GRenderWindow::moveContext() { |