aboutsummaryrefslogtreecommitdiff
path: root/src/script/scripting_server.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:44:42 +0100
committerGitHub <noreply@github.com>2020-11-04 16:44:42 +0100
commit5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch)
treec980d614fec4a5495798be3e79e033229062c3cd /src/script/scripting_server.h
parent28f6a79706b088c37268a59d90878220dc4ef9c7 (diff)
parent3af10766fd2b58b068e970266724d7eb10e9316b (diff)
downloaddragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/scripting_server.h')
-rw-r--r--src/script/scripting_server.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/script/scripting_server.h b/src/script/scripting_server.h
index bf06ab197..b0619f449 100644
--- a/src/script/scripting_server.h
+++ b/src/script/scripting_server.h
@@ -32,19 +32,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/* Scripting <-> Server Game Interface */
/*****************************************************************************/
-class ServerScripting:
- virtual public ScriptApiBase,
- public ScriptApiDetached,
- public ScriptApiEntity,
- public ScriptApiEnv,
- public ScriptApiModChannels,
- public ScriptApiNode,
- public ScriptApiPlayer,
- public ScriptApiServer,
- public ScriptApiSecurity
+class ServerScripting : virtual public ScriptApiBase,
+ public ScriptApiDetached,
+ public ScriptApiEntity,
+ public ScriptApiEnv,
+ public ScriptApiModChannels,
+ public ScriptApiNode,
+ public ScriptApiPlayer,
+ public ScriptApiServer,
+ public ScriptApiSecurity
{
public:
- ServerScripting(Server* server);
+ ServerScripting(Server *server);
// use ScriptApiBase::loadMod() to load mods