Skip to content

Commit ee3bf58

Browse files
committed
refactor: remove erroneously added inline keywords and revert unrelated changes
1 parent a050a4e commit ee3bf58

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ jobs:
113113
arch: x86
114114

115115
- name: Setup vcpkg
116-
if: contains(inputs.preset, 'vcpkg')
117116
uses: lukka/run-vcpkg@v11
118117

119118
- name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,4 @@ cmake-build-*/
5757
## Ninja
5858
.ninja_deps
5959
.ninja_log
60-
build.ninja
61-
62-
## vcpkg
63-
/vcpkg
60+
build.ninja

Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ struct ModelConditionInfo
245245
void loadAnimations() const;
246246
void preloadAssets( TimeOfDay timeOfDay, Real scale ); ///< preload any assets for time of day
247247

248-
inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
249-
inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
248+
Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
249+
const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
250250
#if defined(RTS_DEBUG)
251251
inline AsciiString getDescription() const { return m_description; }
252252
#endif

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ struct ModelConditionInfo
246246
void loadAnimations() const;
247247
void preloadAssets( TimeOfDay timeOfDay, Real scale ); ///< preload any assets for time of day
248248

249-
inline Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
250-
inline const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
249+
Int getConditionsYesCount() const { DEBUG_ASSERTCRASH(!m_conditionsYesVec.empty(), ("empty m_conditionsYesVec.size(), see srj")); return m_conditionsYesVec.size(); }
250+
const ModelConditionFlags& getNthConditionsYes(Int i) const { return m_conditionsYesVec[i]; }
251251
#if defined(RTS_DEBUG)
252252
inline AsciiString getDescription() const { return m_description; }
253253
#endif

0 commit comments

Comments
 (0)