From 9778347c7f118f6b74153f1d2c8070920352eb68 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 23 Feb 2011 02:49:57 +0200 Subject: mainly work on object scripting api --- src/environment.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/environment.h') diff --git a/src/environment.h b/src/environment.h index 124bf9aab..a476230aa 100644 --- a/src/environment.h +++ b/src/environment.h @@ -57,6 +57,7 @@ public: void removePlayer(u16 peer_id); Player * getPlayer(u16 peer_id); Player * getPlayer(const char *name); + Player * getRandomConnectedPlayer(); core::list getPlayers(); core::list getPlayers(bool ignore_disconnected); void printPlayers(std::ostream &o); @@ -79,10 +80,12 @@ protected: #include "serverobject.h" +class Server; + class ServerEnvironment : public Environment { public: - ServerEnvironment(ServerMap *map); + ServerEnvironment(ServerMap *map, Server *server); ~ServerEnvironment(); Map & getMap() @@ -95,6 +98,11 @@ public: return *m_map; } + Server * getServer() + { + return m_server; + } + void step(f32 dtime); void serializePlayers(const std::string &savedir); @@ -140,6 +148,7 @@ public: private: ServerMap *m_map; + Server *m_server; core::map m_active_objects; Queue m_active_object_messages; float m_random_spawn_timer; -- cgit v1.2.3