Skip to content

Post v145 fixes #94

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

Merged
filipppavlov merged 1 commit into from
Sep 17, 2026
Merged

Post v145 fixes #94

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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ if(CMAKE_PROJECT_NAME STREQUAL carbon-trinity AND NOT BUILD_FOR_PYTHON_2)
DOXYGEN_SRC_FILES ${TRINITY_DOCS_SOURCE_FILES}
SPHINX_TARGET_NAME Sphinx
DOXYGEN_TARGET_NAME Doxygen
INSTALL_DESTINATION documentation
INSTALL_DESTINATION documentation/trinity
)
endif()
endif()
4 changes: 2 additions & 2 deletions trinity/Eve/EveTriggerVolume.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ EveTriggerVolume::~EveTriggerVolume()

void EveTriggerVolume::RebuildBoundingSphere()
{
CCP_STATS_ZONE( __FUNCTION__ );
TRINITY_STATS_ZONE( __FUNCTION__ );

m_boundingSphere = CcpMath::Sphere();

Expand Down Expand Up @@ -97,7 +97,7 @@ void EveTriggerVolume::UpdateWorldTransform( Be::Time time )
// IEveSpaceObject2
void EveTriggerVolume::UpdateSyncronous( const EveUpdateContext& updateContext )
{
CCP_STATS_ZONE( __FUNCTION__ );
TRINITY_STATS_ZONE( __FUNCTION__ );

UpdateWorldTransform( updateContext.GetTime() );

Expand Down
4 changes: 2 additions & 2 deletions trinity/Eve/SpaceObjectFactory/EveSOF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ bool EveSOF::BuildChild( EveSpaceObject2* newObj, const char* dnaString, uint32_
{
std::string s = "BuildChild ";
s += std::string( dnaString );
CCP_STATS_ZONE( s.c_str() );
TRINITY_STATS_ZONE( s.c_str() );

EveSOFDNAPtr dna = CreateDna( dnaString );
if( dna == nullptr )
Expand Down Expand Up @@ -3068,7 +3068,7 @@ void EveSOF::SetupBoosters( EveShip2Ptr ship, const EveSOFDNAPtr dna ) const
// --------------------------------------------------------------------------------
void EveSOF::SetupChildBoosters( EveChildContainerPtr child, const EveSOFDNAPtr dna ) const
{
CCP_STATS_ZONE( __FUNCTION__ );
TRINITY_STATS_ZONE( __FUNCTION__ );

// does this hull have boosters at all?
if( dna->GetHullBoosterCount() == 0 )
Expand Down