From 296dee36009b50efc491d3a54de4cc0e57bbbe76 Mon Sep 17 00:00:00 2001
From: sireus <sireus@users.souceforge.net>
Date: Fri, 29 Jun 2012 15:38:02 +0000
Subject: [PATCH] more stopdemo cleanup

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6852 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/admin.cfg           |  1 -
 source/src/clientgame.cpp  |  2 ++
 source/src/server.cpp      |  2 ++
 source/src/serveractions.h | 15 ---------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/config/admin.cfg b/config/admin.cfg
index 5841a328..7756d322 100644
--- a/config/admin.cfg
+++ b/config/admin.cfg
@@ -12,7 +12,6 @@ const unignoreall  [ if $connected [ ingall = 0; clearignored ]; echo (blue)NOTE
 const giveadmin    [ callvote 6 $arg1 ]
 const map          [ callvote 7 $arg1 $arg2 ]
 const recorddemo   [ callvote 8 1 ]
-//const stopdemo     [ callvote 9 ]
 const cleardemo    [ callvote 10 $arg1 ]
 const cleardemos   [ callvote 10 0 ]
 const serverdesc   [ callvote 11 $arg1 ]
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index a84a3286..0ed8f556 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1440,6 +1440,8 @@ void callvote(int type, const char *arg1, const char *arg2)
                 sendstring(arg1, p);
                 break;
             case SA_STOPDEMO:
+                // compatibility
+                break;
             case SA_REMBANS:
             case SA_SHUFFLETEAMS:
                 break;
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 68031f1f..d4cea509 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -2241,6 +2241,8 @@ void callvotepacket (int cn, voteinfo *v = curvote)
             sendstring(v->text, q);
             break;
         case SA_STOPDEMO:
+            // compatibility
+            break;
         case SA_REMBANS:
         case SA_SHUFFLETEAMS:
             break;
diff --git a/source/src/serveractions.h b/source/src/serveractions.h
index c18060a1..8aaaff2f 100644
--- a/source/src/serveractions.h
+++ b/source/src/serveractions.h
@@ -285,21 +285,6 @@ struct recorddemoaction : enableaction            // TODO: remove completely
     }
 };
 
-struct stopdemoaction : serveraction
-{
-    bool isvalid() { return serveraction::isvalid() && m_demo; }
-    void perform()
-    {
-        if(m_demo) enddemoplayback();
-    }
-    stopdemoaction()
-    {
-        role = CR_ADMIN;
-        area |= EE_LOCAL_SERV;
-        copystring(desc, "stop demo playback");
-    }
-};
-
 struct cleardemosaction : serveraction
 {
     int demo;