Skip to content

Commit d308a46

Browse files
committed
NUKE <include> RML element
Closes Unvanquished#2820. An inline template can be used instead of <include>. See the issue, or the parent commit, for an example.
1 parent 6ff0f43 commit d308a46

3 files changed

Lines changed: 0 additions & 74 deletions

File tree

src.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ set(CGAMELIST
168168
${GAMELOGIC_DIR}/cgame/rocket/rocketFocusManager.h
169169
${GAMELOGIC_DIR}/cgame/rocket/rocketFormControlInput.h
170170
${GAMELOGIC_DIR}/cgame/rocket/rocketFormControlSelect.h
171-
${GAMELOGIC_DIR}/cgame/rocket/rocketIncludeElement.h
172171
${GAMELOGIC_DIR}/cgame/rocket/rocketKeyBinder.h
173172
${GAMELOGIC_DIR}/cgame/rocket/rocketProgressBar.h
174173
${GAMELOGIC_DIR}/cgame/rocket/rocketSelectableDataGrid.h

src/cgame/rocket/rocket.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Maryland 20850 USA.
5555
#include "rocketFormControlSelect.h"
5656
#include "rocketConditionalElement.h"
5757
#include "rocketColorInput.h"
58-
#include "rocketIncludeElement.h"
5958
#include "rocketCvarInlineElement.h"
6059
#include <RmlUi/Debugger.h>
6160
#include "lua/register_lua_extensions.h"
@@ -425,7 +424,6 @@ void Rocket_Init()
425424
RegisterElement<CvarElementFormControlSelect>( "select" );
426425
RegisterElement<RocketConditionalElement>( "if" );
427426
RegisterElement<RocketColorInput>( "colorinput" );
428-
RegisterElement<RocketIncludeElement>( "include" );
429427
RegisterElement<RocketCvarInlineElement>( "inlinecvar" );
430428

431429
whiteShader = trap_R_RegisterShader( "gfx/colors/white", RSF_2D );

src/cgame/rocket/rocketIncludeElement.h

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)