Skip to content

Object: Set default veterancy level when no controller is assigned #91

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
+18 −2
Open

Object: Set default veterancy level when no controller is assigned #91

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
10 changes: 9 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,15 @@ Object::Object( const ThingTemplate *tt, const ObjectStatusMaskType &objectStatu

// If a valid team has been assigned me, then I have a Player I can ask about my starting level
const Player* controller = getControllingPlayer();
m_experienceTracker->setVeterancyLevel( controller->getProductionVeterancyLevel( getTemplate()->getName() ) );
if (controller)
{
m_experienceTracker->setVeterancyLevel( controller->getProductionVeterancyLevel( getTemplate()->getName() ) );
}
else
{
// No valid controller, set to default veterancy level
m_experienceTracker->setVeterancyLevel( VETERANCY_REGULAR );
}

/// allow for inter-Module resolution
for (BehaviorModule** b = m_behaviors; *b; ++b)
Expand Down
10 changes: 9 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,15 @@

// If a valid team has been assigned me, then I have a Player I can ask about my starting level
const Player* controller = getControllingPlayer();
m_experienceTracker->setVeterancyLevel( controller->getProductionVeterancyLevel( getTemplate()->getName() ) );
if (controller)
{
m_experienceTracker->setVeterancyLevel( controller->getProductionVeterancyLevel( getTemplate()->getName() ) );
}
else
{
// No valid controller, set to default veterancy level
m_experienceTracker->setVeterancyLevel( VETERANCY_REGULAR );

Check failure on line 480 in GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 'VETERANCY_REGULAR': undeclared identifier

Check failure on line 480 in GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 'VETERANCY_REGULAR': undeclared identifier
}

/// allow for inter-Module resolution
for (BehaviorModule** b = m_behaviors; *b; ++b)
Expand Down
Loading