aboutsummaryrefslogtreecommitdiff
path: root/src/script/scripting_client.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_client.h
parent28f6a79706b088c37268a59d90878220dc4ef9c7 (diff)
parent3af10766fd2b58b068e970266724d7eb10e9316b (diff)
downloaddragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/script/scripting_client.h')
-rw-r--r--src/script/scripting_client.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h
index e162f8bcf..b8dd257a9 100644
--- a/src/script/scripting_client.h
+++ b/src/script/scripting_client.h
@@ -31,12 +31,11 @@ class LocalPlayer;
class Camera;
class Minimap;
-class ClientScripting:
- virtual public ScriptApiBase,
- public ScriptApiSecurity,
- public ScriptApiClient,
- public ScriptApiModChannels,
- public ScriptApiCheats
+class ClientScripting : virtual public ScriptApiBase,
+ public ScriptApiSecurity,
+ public ScriptApiClient,
+ public ScriptApiModChannels,
+ public ScriptApiCheats
{
public:
ClientScripting(Client *client);