Skip to content
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.

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

Fix error in SysTimeClass::Get #1105

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

xezon
Copy link
Contributor

@xezon xezon commented Feb 11, 2024

This claims to be a fix for a Thyme specific issue.

@codecov-commenter
Copy link

codecov-commenter commented Feb 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (549c535) 2.53% compared to head (ddd4fe0) 2.54%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #1105   +/-   ##
========================================
  Coverage     2.53%    2.54%           
========================================
  Files          949      949           
  Lines       110299   110299           
  Branches     18881    18881           
========================================
+ Hits          2800     2802    +2     
+ Misses      107095   107094    -1     
+ Partials       404      403    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tomsons26 tomsons26 self-requested a review February 15, 2024 03:04
Copy link
Contributor

@tomsons26 tomsons26 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems was

int SysTimeClass::Get()
{
#ifdef GAME_DLL
#define _is_init (Make_Global<bool>(0x00A66B30))
#else
    static bool _is_init;
#endif
    if (!_is_init) {
        Reset();
        _is_init = true;
    }

    unsigned time = rts::Get_Time();

    if (time > m_startTime) {
        return time - m_startTime;
    }
    return time + m_negTime;
}

@xezon xezon force-pushed the fix-error-systimeclass branch 2 times, most recently from b30f077 to f49bf3d Compare February 15, 2024 18:17
@xezon
Copy link
Contributor Author

xezon commented Feb 15, 2024

Fixed.

@xezon xezon force-pushed the fix-error-systimeclass branch from f49bf3d to ddd4fe0 Compare February 15, 2024 22:11
@xezon xezon merged commit 16343ac into TheAssemblyArmada:develop Feb 15, 2024
7 checks passed
@xezon xezon deleted the fix-error-systimeclass branch February 15, 2024 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants