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 updating base classes #337

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Fix updating base classes #337

merged 4 commits into from
Sep 17, 2024

Conversation

DartRuffian
Copy link
Contributor

Fix updating the base classes for various classes.
Currently when launching the game, the following errors will be logged to the rpt:

11:40:51 Updating base class Controls->, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditMulti3/Controls/ (original a3\3den\config.bin)
11:40:51 Updating base class Controls->, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti3/Controls/ (original a3\3den\config.bin)
11:40:51 Updating base class EditMulti5->EditCodeMulti3, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti5/ (original a3\3den\config.bin)
11:40:51 Updating base class Controls->Controls, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti5/Controls/ (original a3\3den\config.bin)
11:40:51 Updating base class Background->Background, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti5/Controls/Background/ (original a3\3den\config.bin)
11:40:51 Updating base class Value->Value, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti5/Controls/Value/ (original a3\3den\config.bin)
11:40:51 Updating base class Title->Title, by x\enh\addons\main\config.bin/Cfg3DEN/Attributes/EditCodeMulti5/Controls/Title/ (original a3\3den\config.bin)
11:40:51 Updating base class ValueX->ctrlButton, by x\enh\addons\main\config.bin/Display3DEN/Controls/StatusBar/Controls/Version/ (original a3\3den\config.bin)
11:40:51 Updating base class RscButtonMenu->ButtonSpectatorCamera, by x\enh\addons\main\config.bin/RscDebugConsole/Controls/ButtonFunctions/ (original a3\ui_f\config.bin)

This PR fixes these errors by correcting the inheritance. For example, EditCodeMulti5 is supposed to inherit from EditMulti5; however 3den Enhanced incorrectly has it inheriting from EditCodeMulti3.

The same changes were made to both EditCodeMulti5 and EditMulti5. After fixing the inheritance, the changes to EditCodeMulti5 are no longer needed since they are inherited from EditMulti5
Copy link

Do not forget to also update the following files:

addons/main/cfg3DEN.hpp Outdated Show resolved Hide resolved
@R3voA3
Copy link
Owner

R3voA3 commented Sep 16, 2024

Thanks for the PR. However, I cannot merge it like that as it removes the height changes of the edit controls and breaks the version button in the status bar.

I'll take a look at it tomorrow.

@DartRuffian
Copy link
Contributor Author

I figured it would break stuff, but I'm not too familiar with all of the things that 3DEN Enhanced touches, so I figured I'd do the inheritance fixes first.

@R3voA3
Copy link
Owner

R3voA3 commented Sep 17, 2024

I figured it would break stuff, but I'm not too familiar with all of the things that 3DEN Enhanced touches, so I figured I'd do the inheritance fixes first.

All good. I'll look into it later this week.

@R3voA3 R3voA3 merged commit aabb92c into R3voA3:master Sep 17, 2024
@DartRuffian DartRuffian deleted the bug/updating-base-class branch September 17, 2024 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants