jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use 'git describe' to generate version info for the about box and servatrice. fixes issue #20

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-02-21 01:08:16 +01:00
parent a1bcd9854f
commit 89bb8e72ee
10 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
servatrice/src/serversocketinterface.cpp
View file

@ -45,6 +45,7 @@
#include "pb/serverinfo_user.pb.h"
#include "pb/serverinfo_deckstorage.pb.h"
#include "version_string.h"
#include <string>
#include <iostream>
@ -61,7 +62,7 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, QTcpSocket *_s
Event_ServerIdentification identEvent;
identEvent.set_server_name(servatrice->getServerName().toStdString());
identEvent.set_server_version(Servatrice::versionString.toStdString());
identEvent.set_server_version(VERSION_STRING);
identEvent.set_protocol_version(protocolVersion);
SessionEvent *identSe = prepareSessionEvent(identEvent);
sendProtocolItem(*identSe);