diff -r 404ddce27b23 -r c13ebed437cb QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Wed Feb 20 02:21:58 2013 +0100 +++ b/QTfrontend/hwconsts.cpp.in Tue Apr 02 21:00:57 2013 +0200 @@ -19,10 +19,15 @@ #include #include "hwconsts.h" +#include "weapons.h" +// cDataDir gets 'Data' appended later (in main.cpp) +QString * cDataDir = new QString("${HEDGEWARS_DATADIR}"); QString * cProtoVer = new QString("${HEDGEWARS_PROTO_VER}"); -QString * cDataDir = new QString("${HEDGEWARS_DATADIR}"); QString * cVersionString = new QString("${HEDGEWARS_VERSION}"); +QString * cRevisionString = new QString("${HEDGEWARS_REVISION}"); +QString * cHashString = new QString("${HEDGEWARS_HASH}"); + QDir * bindir = new QDir(); QDir * cfgdir = new QDir(); @@ -59,6 +64,9 @@ << qMakePair(QString("Thinking with Portals"), QString( AMMOLINE_PORTALS_QT AMMOLINE_PORTALS_PROB AMMOLINE_PORTALS_DELAY AMMOLINE_PORTALS_CRATE )) + << qMakePair(QString("One of Everything"), QString( + AMMOLINE_ONEEVERY_QT AMMOLINE_ONEEVERY_PROB + AMMOLINE_ONEEVERY_DELAY AMMOLINE_ONEEVERY_CRATE )) ; unsigned int colors[] = HW_TEAMCOLOR_ARRAY; @@ -66,8 +74,5 @@ QString * netHost = new QString(); quint16 netPort = NETGAME_DEFAULT_PORT; -bool haveServer = ${HAVE_NETSERVER}; -bool isDevBuild = ${HW_DEV}; - int season = SEASON_NONE; int years_since_foundation = 0;