Merge pull request #1695 from Bloodknight/extra_define_fix

Tidy up unnecessary #define
This commit is contained in:
Anis 2016-08-07 00:40:57 +02:00 committed by GitHub
commit 1c761ac136
2 changed files with 2 additions and 4 deletions

View file

@ -407,7 +407,7 @@ bool GameConnection::readConnectAccept(BitStream *stream, const char **errorStri
void GameConnection::writeConnectRequest(BitStream *stream)
{
Parent::writeConnectRequest(stream);
stream->writeString(GameString);
stream->writeString(TORQUE_APP_NAME);
stream->write(CurrentProtocolVersion);
stream->write(MinRequiredProtocolVersion);
stream->writeString(mJoinPassword);
@ -424,7 +424,7 @@ bool GameConnection::readConnectRequest(BitStream *stream, const char **errorStr
U32 currentProtocol, minProtocol;
char gameString[256];
stream->readString(gameString);
if(dStrcmp(gameString, GameString))
if(dStrcmp(gameString, TORQUE_APP_NAME))
{
*errorString = "CHR_GAME";
return false;

View file

@ -55,8 +55,6 @@ class MoveList;
struct Move;
struct AuthInfo;
#define GameString TORQUE_APP_NAME
const F32 MinCameraFov = 1.f; ///< min camera FOV
const F32 MaxCameraFov = 179.f; ///< max camera FOV