Skip to content

Add null check for system time string before drawing #192

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

Add null check for system time string before drawing #192

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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5971,6 +5971,11 @@ void InGameUI::drawRenderFps(Int &x, Int &y)

void InGameUI::drawSystemTime(Int &x, Int &y)
{
if (!m_systemTimeString)
{
return;
}

// current system time
SYSTEMTIME systemTime;
GetLocalTime( &systemTime );
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6208,8 +6208,14 @@
}
}

void InGameUI::drawSystemTime(Int &x, Int &y)

Check failure on line 6211 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 'void InGameUI::drawSystemTime(Int &,Int &)': redeclaration of member is not allowed

Check failure on line 6211 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 'void InGameUI::drawSystemTime(Int &,Int &)': redeclaration of member is not allowed

Check failure on line 6211 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 'void InGameUI::drawSystemTime(Int &,Int &)': redeclaration of member is not allowed
if (!m_systemTimeString)

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 syntax error: 'if'

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 syntax error: missing ';' before 'if'

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 syntax error: 'if'

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 syntax error: missing ';' before 'if'

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 syntax error: 'if'

Check failure on line 6212 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 syntax error: missing ';' before 'if'
{

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 '{': missing function header (old-style formal list?)

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 syntax error: missing ';' before '{'

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 '{': missing function header (old-style formal list?)

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 syntax error: missing ';' before '{'

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 '{': missing function header (old-style formal list?)

Check failure on line 6213 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 syntax error: missing ';' before '{'
return;
}


{

Check failure on line 6218 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 '{': missing function header (old-style formal list?)

Check failure on line 6218 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 '{': missing function header (old-style formal list?)

Check failure on line 6218 in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 '{': missing function header (old-style formal list?)
// current system time
SYSTEMTIME systemTime;
GetLocalTime( &systemTime );
Expand Down Expand Up @@ -6345,4 +6351,6 @@
m_gameTimeFrameString->draw(horizontalFrameOffset, m_gameTimePosition.y, GameMakeColor(180,180,180,255), m_gameTimeDropColor);
}




Expand Down
Loading