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

Implement more of InGameUI #1065

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Conversation

jonwil
Copy link
Contributor

@jonwil jonwil commented Jan 31, 2024

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented Jan 31, 2024

Codecov Report

Attention: 871 lines in your changes are missing coverage. Please review.

Comparison is base (eff5c4e) 2.61% compared to head (3eb4fbf) 2.59%.

Files Patch % Lines
src/game/client/ingameui.cpp 0.00% 730 Missing ⚠️
src/platform/w3dengine/client/w3dingameui.cpp 0.00% 114 Missing ⚠️
src/game/logic/object/weaponset.cpp 0.00% 18 Missing ⚠️
src/game/client/ingameui.h 0.00% 2 Missing ⚠️
src/game/logic/ai/aigroup.cpp 0.00% 2 Missing ⚠️
src/platform/w3dengine/client/w3dgameclient.cpp 0.00% 2 Missing ⚠️
src/game/common/rts/actionmanager.cpp 0.00% 1 Missing ⚠️
src/game/common/rts/player.cpp 0.00% 1 Missing ⚠️
src/game/logic/ai/turretai.cpp 0.00% 1 Missing ⚠️

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

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1065      +/-   ##
===========================================
- Coverage     2.61%    2.59%   -0.03%     
===========================================
  Files          930      930              
  Lines       106952   107792     +840     
  Branches     18215    18382     +167     
===========================================
  Hits          2799     2799              
- Misses      103749   104589     +840     
  Partials       404      404              

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

src/hooker/setuphooks_zh.cpp Outdated Show resolved Hide resolved
src/hooker/setuphooks_zh.cpp Outdated Show resolved Hide resolved
src/platform/w3dengine/client/w3dingameui.cpp Show resolved Hide resolved
src/platform/w3dengine/client/w3dingameui.cpp Outdated Show resolved Hide resolved
src/platform/w3dengine/client/w3dingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/platform/w3dengine/client/w3dingameui.cpp Show resolved Hide resolved
Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Game crashes when pressing Idle Worker button:

>	thyme.dll!InGameUI::Select_Next_Idle_Worker() Line 3646	C++
 	thyme.dll!GameWindowManager::Win_Send_System_Msg(GameWindow * window, unsigned int msg, unsigned int data1, unsigned int data2) Line 451	C++
 	game.dat!005abdb2()	Unknown
 	game.dat![Frames below may be incorrect and/or missing, no symbols loaded for game.dat]	Unknown
 	thyme.dll!GameWindowManager::Win_Send_Input_Msg(GameWindow * window, unsigned int msg, unsigned int data1, unsigned int data2) Line 464	C++
 	thyme.dll!GameWindowManager::Win_Process_Mouse_Event(GameWindowMessage msg, ICoord2D * mouse_pos, void * data) Line 742	C++
 	game.dat!0061725f()	Unknown
 	thyme.dll!MessageStream::Propagate_Messages() Line 177	C++
Exception thrown: read access violation.
draw was nullptr.
            Drawable *draw = g_theInGameUI->Get_First_Selected_Drawable();

            for (auto it = m_idleWorkerLists[index].begin(); it != m_idleWorkerLists[index].end(); it++) {
                if (*it == draw->Get_Object()) {
                    if (it != m_idleWorkerLists[index].end()) {
                        obj = *it;
                    } else {
                        obj = *m_idleWorkerLists[index].begin();
                    }

                    break;
                }
            }

@xezon
Copy link
Contributor

xezon commented Feb 1, 2024

Perhaps forgot to hook constructor of InGameUI?

@xezon
Copy link
Contributor

xezon commented Feb 1, 2024

Selecting faction building and pressing E button will attempt selecting matching units. Is introduced with this change. Is not fixed by commenting all new hooks.

shot_20240201_182931_1

@xezon

This comment was marked as resolved.

@jonwil
Copy link
Contributor Author

jonwil commented Feb 1, 2024

Fixed idle worker crash.
Fixed issue with selecting a structure and pressing E.
InGameUI constructor is hooked in via W3DGameClient::Create_InGameUI

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Select next idle worker does not work. It will only select the first worker on every button press.

shot_20240201_195707_1

@jonwil
Copy link
Contributor Author

jonwil commented Feb 1, 2024

Fixed idle worker selection.

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Select matching units on screen and map works
Region select and draw works
Floating text works
Draw move hint works
Draw place angle works
Group repair works
Group docking works
Group healing works
Group resume construction works
Group hijack works
Group enter works
Group enter bomb car works
Group disable vehicle works
Set Rally point works
Group combat drop works
Group sabotage building works
Special Power at target works
Special Power at location works
Group attack works
Hidden tool tip during military briefing works
Select next and previous idle worker works
Hide worker idle button in Replay works

@jonwil jonwil merged commit 2243feb into TheAssemblyArmada:develop Feb 1, 2024
7 checks passed
@jonwil jonwil deleted the ingameui5 branch February 1, 2024 19:31
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