sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preparing 1.0 beta1.

Browse Source
This commit is contained in:
lotodore
2012-12-23 14:38:20 +01:00
parent f46f2fe9fd
commit 805a804400
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1 -1
View File
@@ -1,4 +1,4 @@
2012-12-22 version 1.0-beta1
2012-12-23 version 1.0-beta1
- Support for higher android screen resolutions (enhancement #160)
- Android sound support (enhancement #156)
- Game name in window title (enhancement #155)
src/game_defs.h
+4 -4
View File
@@ -28,12 +28,12 @@
#define SQLITE_LOG 1
#define HTML_LOG 0
#define POKERTH_VERSION_MAJOR 0
#define POKERTH_VERSION_MINOR 95
#define POKERTH_VERSION_MAJOR 1
#define POKERTH_VERSION_MINOR 0
#define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)
#define POKERTH_BETA_REVISION 0
#define POKERTH_BETA_RELEASE_STRING "0.9.5"
#define POKERTH_BETA_REVISION 1
#define POKERTH_BETA_RELEASE_STRING "1.0 beta1"
#define SQLITE_LOG_VERSION 1
src/net/common/clientstate.cpp
+3 -2
View File
@@ -323,10 +323,11 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
const TiXmlNode *addr4Node = nextServer->FirstChild("IPv4Address");
const TiXmlNode *addr6Node = nextServer->FirstChild("IPv6Address");
const TiXmlNode *sctpNode = nextServer->FirstChild("SCTP");
const TiXmlNode *portNode = nextServer->FirstChild("Port");
const TiXmlNode *portNode = nextServer->FirstChild("ProtobufPort");
// IPv6 support for avatar servers depends on this address and on libcurl.
const TiXmlNode *avatarNode = nextServer->FirstChild("AvatarServerAddress");
// 1.0 beta1 temporary change!
const TiXmlNode *avatarNode = NULL;//nextServer->FirstChild("AvatarServerAddress");
if (!nameNode || !nameNode->ToElement() || !addr4Node || !addr4Node->ToElement()
|| !addr6Node || !addr6Node->ToElement() || !portNode || !portNode->ToElement())