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:57:47 +0100
committerGitHub <noreply@github.com>2020-11-04 16:57:47 +0100
commit3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch)
treec070350db219f2c4241d22bc31949685c7b42fe9 /src/script/scripting_client.h
parent5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff)
parent6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff)
downloaddragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.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, 6 insertions, 5 deletions
diff --git a/src/script/scripting_client.h b/src/script/scripting_client.h
index b8dd257a9..e162f8bcf 100644
--- a/src/script/scripting_client.h
+++ b/src/script/scripting_client.h
@@ -31,11 +31,12 @@ 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);