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

Merge pull request #19 from jayands/master 

Fix for T2
This commit is contained in:
Zach Bacon 2016-08-09 10:12:13 -04:00 committed by GitHub
parent 5b7a9ea52c e4354eedd2
commit 1eb768578b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ src/wx/cmd-evtable.h
src/wx/cmdhandlers.h src/wx/cmdhandlers.h
src/wx/cmdtab.cpp src/wx/cmdtab.cpp
src/wx/wxvbam.xrs src/wx/wxvbam.xrs
build/

2
src/gba/GBASockClient.cpp
View File

@ -7,7 +7,7 @@
GBASockClient::GBASockClient(sf::IpAddress _server_addr) GBASockClient::GBASockClient(sf::IpAddress _server_addr)
{ {
if (_server_addr == sf::IpAddress::None) if (_server_addr == sf::IpAddress::None)
server_addr = sf::IpAddress::LocalHost; server_addr = sf::IpAddress::getPublicAddress();
else else
server_addr = _server_addr; server_addr = _server_addr;

2
src/gba/GBASockClient.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <cstdlib> #include <cstdint>
#include <SFML/Network.hpp> #include <SFML/Network.hpp>
class GBASockClient { class GBASockClient {