Tune generation responsiveness and cheat inhibition on server

[minetest.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 3baeb433df261079ab811f5c3b909789085bf523..6c789f7b5f0b7c5055b97f2b6c180efd545fddda 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mods.h"
 #include "inventorymanager.h"
 #include "subgame.h"
+#include "sound.h"
 struct LuaState;
 typedef struct lua_State lua_State;
 class IWritableItemDefManager;
@@ -252,21 +253,21 @@ struct PrioritySortedBlockTransfer
        u16 peer_id;
 };
 
-struct TextureRequest
+struct MediaRequest
 {
        std::string name;
 
-       TextureRequest(const std::string &name_=""):
+       MediaRequest(const std::string &name_=""):
                name(name_)
        {}
 };
 
-struct TextureInformation
+struct MediaInfo
 {
        std::string path;
        std::string sha1_digest;
 
-       TextureInformation(const std::string path_="",
+       MediaInfo(const std::string path_="",
                        const std::string sha1_digest_=""):
                path(path_),
                sha1_digest(sha1_digest_)
@@ -274,6 +275,58 @@ struct TextureInformation
        }
 };
 
+struct ServerSoundParams
+{
+       float gain;
+       std::string to_player;
+       enum Type{
+               SSP_LOCAL=0,
+               SSP_POSITIONAL=1,
+               SSP_OBJECT=2
+       } type;
+       v3f pos;
+       u16 object;
+       float max_hear_distance;
+       bool loop;
+
+       ServerSoundParams():
+               gain(1.0),
+               to_player(""),
+               type(SSP_LOCAL),
+               pos(0,0,0),
+               object(0),
+               max_hear_distance(32*BS),
+               loop(false)
+       {}
+       
+       v3f getPos(ServerEnvironment *env, bool *pos_exists) const
+       {
+               if(pos_exists) *pos_exists = false;
+               switch(type){
+               case SSP_LOCAL:
+                       return v3f(0,0,0);
+               case SSP_POSITIONAL:
+                       if(pos_exists) *pos_exists = true;
+                       return pos;
+               case SSP_OBJECT: {
+                       if(object == 0)
+                               return v3f(0,0,0);
+                       ServerActiveObject *sao = env->getActiveObject(object);
+                       if(!sao)
+                               return v3f(0,0,0);
+                       if(pos_exists) *pos_exists = true;
+                       return sao->getBasePosition(); }
+               }
+               return v3f(0,0,0);
+       }
+};
+
+struct ServerPlayingSound
+{
+       ServerSoundParams params;
+       std::set<u16> clients; // peer ids
+};
+
 class RemoteClient
 {
 public:
@@ -464,6 +517,11 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Envlock and conlock should be locked when calling this
        void SendMovePlayer(Player *player);
        
+       // Returns -1 if failed, sound handle on success
+       // Envlock + conlock
+       s32 playSound(const SimpleSoundSpec &spec, const ServerSoundParams &params);
+       void stopSound(s32 handle);
+       
        // Thread-safe
        u64 getPlayerAuthPrivs(const std::string &name);
        void setPlayerAuthPrivs(const std::string &name, u64 privs);
@@ -586,11 +644,10 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Sends blocks to clients (locks env and con on its own)
        void SendBlocks(float dtime);
        
-       void PrepareTextures();
-
-       void SendTextureAnnouncement(u16 peer_id);
-
-       void SendTexturesRequested(u16 peer_id,core::list<TextureRequest> tosend);
+       void fillMediaCache();
+       void sendMediaAnnouncement(u16 peer_id);
+       void sendRequestedMedia(u16 peer_id,
+                       const core::list<MediaRequest> &tosend);
 
        /*
                Something random
@@ -774,7 +831,13 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        friend class EmergeThread;
        friend class RemoteClient;
 
-       std::map<std::string,TextureInformation> m_Textures;
+       std::map<std::string,MediaInfo> m_media;
+
+       /*
+               Sounds
+       */
+       std::map<s32, ServerPlayingSound> m_playing_sounds;
+       s32 m_next_sound_id;
 };
 
 /*