Skip to content

refactor: Remove superfluous defines from Language.h #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
Merged

refactor: Remove superfluous defines from Language.h #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions Generals/Code/GameEngine/Include/Common/Language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,6 @@ typedef enum

} LanguageID;

#define GameStrcpy wcscpy
#define GameStrlen wcslen
#define GameStrcat wcscat
#define GameStrcmp wcscmp
#define GameStrncmp wcsncmp
#define GameStricmp wcsicmp
#define GameStrnicmp wcsnicmp
#define GameStrtok wcstok
#define GameSprintf swprintf
#define GameVsprintf vswprintf
/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
#define GameAtoi(S) wcstol( (S), NULL, 10)
#define GameAtod(S) wcstod( (S), NULL )
#define GameItoa _itow
#define GameSscanf swscanf
#define GameStrstr wcsstr
#define GameStrchr wcschr
#define GameIsDigit iswdigit
#define GameIsAscii iswascii
#define GameIsAlNum iswalnum
#define GameIsAlpha iswalpha
#define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0

// INLINING ///////////////////////////////////////////////////////////////////
Expand Down
7 changes: 3 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine

// USER INCLUDES //////////////////////////////////////////////////////////////
#include "Common/Language.h"
#include "GameClient/Image.h"
#include "GameClient/Display.h"
#include "GameClient/GameWindowManager.h"
Expand Down Expand Up @@ -196,7 +195,7 @@ Int GameWindowManager::winFontHeight( GameFont *font )
Int GameWindowManager::winIsDigit( Int c )
{

return GameIsDigit( c );
return iswdigit( c );

}

Expand All @@ -206,7 +205,7 @@ Int GameWindowManager::winIsDigit( Int c )
Int GameWindowManager::winIsAscii( Int c )
{

return GameIsAscii( c );
return iswascii( c );

}

Expand All @@ -216,7 +215,7 @@ Int GameWindowManager::winIsAscii( Int c )
Int GameWindowManager::winIsAlNum( Int c )
{

return GameIsAlNum( c );
return iswalnum( c );

}

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ void IMEManager::updateCompositionString( void )
else
{
m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
convRes = GameStrlen ( m_compositionString );
convRes = wcslen( m_compositionString );
}

// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ WideChar Keyboard::translateKey( WideChar keyCode )
return( m_keyNames[ ubKeyCode ].shifted2 );
}

if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
{
return( m_keyNames[ ubKeyCode ].shifted );
}
Expand Down
21 changes: 0 additions & 21 deletions GeneralsMD/Code/GameEngine/Include/Common/Language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,6 @@ typedef enum

} LanguageID;

#define GameStrcpy wcscpy
#define GameStrlen wcslen
#define GameStrcat wcscat
#define GameStrcmp wcscmp
#define GameStrncmp wcsncmp
#define GameStricmp wcsicmp
#define GameStrnicmp wcsnicmp
#define GameStrtok wcstok
#define GameSprintf swprintf
#define GameVsprintf vswprintf
/// @todo -- add a non-malloc-based string dup func #define GameStrdup wcsdup
#define GameAtoi(S) wcstol( (S), NULL, 10)
#define GameAtod(S) wcstod( (S), NULL )
#define GameItoa _itow
#define GameSscanf swscanf
#define GameStrstr wcsstr
#define GameStrchr wcschr
#define GameIsDigit iswdigit
#define GameIsAscii iswascii
#define GameIsAlNum iswalnum
#define GameIsAlpha iswalpha
#define GameArrayEnd(array) (array)[(sizeof(array)/sizeof((array)[0]))-1] = 0

// INLINING ///////////////////////////////////////////////////////////////////
Expand Down
7 changes: 3 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowGlobal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include "PreRTS.h" // This must go first in EVERY cpp file int the GameEngine

// USER INCLUDES //////////////////////////////////////////////////////////////
#include "Common/Language.h"
#include "GameClient/Image.h"
#include "GameClient/Display.h"
#include "GameClient/GameWindowManager.h"
Expand Down Expand Up @@ -196,7 +195,7 @@ Int GameWindowManager::winFontHeight( GameFont *font )
Int GameWindowManager::winIsDigit( Int c )
{

return GameIsDigit( c );
return iswdigit( c );

}

Expand All @@ -206,7 +205,7 @@ Int GameWindowManager::winIsDigit( Int c )
Int GameWindowManager::winIsAscii( Int c )
{

return GameIsAscii( c );
return iswascii( c );

}

Expand All @@ -216,7 +215,7 @@ Int GameWindowManager::winIsAscii( Int c )
Int GameWindowManager::winIsAlNum( Int c )
{

return GameIsAlNum( c );
return iswalnum( c );

}

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ void IMEManager::updateCompositionString( void )
else
{
m_compositionCursorPos = (ImmGetCompositionString( m_context, GCS_CURSORPOS, NULL, 0) & 0xffff );
convRes = GameStrlen ( m_compositionString );
convRes = wcslen( m_compositionString );
}

// m_compositionCursorPos is in DBCS characters, need to convert it to Wide characters
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ WideChar Keyboard::translateKey( WideChar keyCode )
return( m_keyNames[ ubKeyCode ].shifted2 );
}

if( isShift() || getCapsState() && GameIsAlpha( m_keyNames[ ubKeyCode ].stdKey ) )
if( isShift() || getCapsState() && iswalpha( m_keyNames[ ubKeyCode ].stdKey ) )
{
return( m_keyNames[ ubKeyCode ].shifted );
}
Expand Down
Loading