Repository navigation
bugfix(object): Add support for object that has POWERED KindOf type without power #3574
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
Open
Caball009
wants to merge
4
commits into
TheSuperHackers:main
Choose a base branch
from
Caball009:Caball009/fix_kindof_powered
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+37
−14
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
090c019
bugfix(drawable): Fix crash in Drawable::setColorTintEnvelope.
Caball009 35e63e1
bugfix(drawable): Set disabled tint status for powered units that get…
Caball009 3a393dc
tweak(object): Add support for powered objects with zero energy consu…
Caball009 daf2959
fix(object): Initialize Object::m_behaviors fields as nullptr.
Caball009 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,6 +143,13 @@ void Energy::objectEnteringInfluence( Object *obj ) | |
| addConsumption( -energy ); | ||
| else if( energy > 0 ) | ||
| addProduction( energy ); | ||
| #if !RETAIL_COMPATIBLE_CRC | ||
| // TheSuperHackers @tweak Add support for powered objects that consume no energy. | ||
| else if (obj->isKindOf(KINDOF_POWERED)) | ||
| { | ||
| obj->doPowerDisable(!hasSufficientPower()); | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can do void Object::doPowerDisable( bool disabling )
{
if( isKindOf(KINDOF_POWERED) )
{
if( disabling )
setDisabled( DISABLED_UNDERPOWERED ); //set disabled has a pauseAllSpecialPowers that prevents double pausing
else
clearDisabled( DISABLED_UNDERPOWERED );
}
}
static void Player::doPowerDisable( Object *obj, void *userData )
{
if (obj)
{
Bool disabling = *((Bool*)userData);
obj->doPowerDisable(&disabling);
}
}
void Energy::objectEnteringInfluence( Object *obj )
{
...
else
{
obj->doPowerDisable(!hasSufficientPower());
}
...
}
Or better flip to
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changed. |
||
| #endif | ||
|
|
||
| // sanity | ||
| DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks odd because it is unpaired in
objectLeavingInfluenceand it does not match the previous intent of the function - see EA comment above the function.Does this perhaps belong somewhere else?
Was this change needed to make it properly work, for example if a structure is captured and the player has not enough power?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It could be added here, but it was deemed undesirable (#3574 (comment)).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Github brings me nowhere good when clicking that link.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about now? I unresolved that particular conversation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems the branch was force pushed after that pull comment, so I am unable to understand the context of the comment, aka where it was placed before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is relevant anymore now that the code's updated.