ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3467 from mathieui/netplay_version_commit_hash 

Use the current commit hash in the netplay version
This commit is contained in:
Pierre Bourdon 2016-01-07 00:45:11 +01:00
parent 22555312de 40c7a2fb7d
commit 7c91dbe239
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/NetPlayClient.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/ENetUtil.h" #include "Common/ENetUtil.h"
#include "Common/Timer.h" #include "Common/Timer.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
@ -19,6 +20,7 @@
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
static const char* NETPLAY_VERSION = scm_rev_git_str;
static std::mutex crit_netplay_client; static std::mutex crit_netplay_client;
static NetPlayClient * netplay_client = nullptr; static NetPlayClient * netplay_client = nullptr;
NetSettings g_NetPlaySettings; NetSettings g_NetPlaySettings;

2
Source/Core/Core/NetPlayProto.h
View File

@ -9,8 +9,6 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_Device.h"
#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24"
struct NetSettings struct NetSettings
{ {
bool m_CPUthread; bool m_CPUthread;

2
Source/Core/Core/NetPlayServer.cpp
View File

@ -5,6 +5,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "Common/Common.h"
#include "Common/ENetUtil.h" #include "Common/ENetUtil.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
@ -24,6 +25,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
static const char* NETPLAY_VERSION = scm_rev_git_str;
u64 g_netplay_initial_gctime = 1272737767; u64 g_netplay_initial_gctime = 1272737767;
NetPlayServer::~NetPlayServer() NetPlayServer::~NetPlayServer()