浏览代码

Merge pull request #1695 from Bloodknight/extra_define_fix

Tidy up unnecessary #define
Anis 9 年之前
父节点
当前提交
1c761ac136
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 2 2
      Engine/source/T3D/gameBase/gameConnection.cpp
  2. 0 2
      Engine/source/T3D/gameBase/gameConnection.h

+ 2 - 2
Engine/source/T3D/gameBase/gameConnection.cpp

@@ -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;

+ 0 - 2
Engine/source/T3D/gameBase/gameConnection.h

@@ -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