Blinker

@@ -3,6 +3,7 @@

    Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html

    a blinkenarea.org project */

+#include <set>

 #include <sstream>

 #include <string>

 #include <vector>

@@ -32,7 +33,7 @@ Game::Game(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileBackgroundColor(dirBase.getFile("backgroundColor")),

   m_fileOutStream(dirBase.getFile("outstream"), mgrs.m_streamMgr),

   m_height(0), m_width(0), m_channels(0), m_imgBuf(), m_backgroundColor(),

-  m_haveTimeStep(false), m_timeStepTime()

+  m_haveTimeStep(false), m_timeStepTime(), m_opConnsClose()

 {

 }

@@ -87,7 +88,11 @@ void Game::updateConfig()

 /// callback when requested time reached

 void Game::timeCall()

 {

-  // TODO: internal stuff

+  // close operator connections

+  for (OpConn *pConn : m_opConnsClose) {

+    pConn->close();

+  }

+  m_opConnsClose.clear();

   // time step of game has been reached -> call game

   if (m_haveTimeStep && Time::now() >= m_timeStepTime) {

@@ -390,6 +395,22 @@ void Game::unsetTimeStep()

   planTimeCall();

 }

+/// request closing operator connection (NULL ok) (closed via time call)

+void Game::requestOpConnClose(OpConn *pConn)

+{

+  if (pConn) {

+    m_opConnsClose.insert(pConn);

+    planTimeCall();

+  }

+}

+

+/// remove operator connection from requests (call when op conn is closed)

+void Game::forgetOpConn(OpConn *pConn)

+{

+  m_opConnsClose.erase(pConn);

+  planTimeCall();

+}

+

 /// (re-)create image buffer

 void Game::createImgBuf()

 {

@@ -428,6 +449,12 @@ void Game::destroyImgBuf()

 /// request next time call - or cancel request if not needed

 void Game::planTimeCall()

 {

+  // request immediate time call if there are internal time-based actions

+  if (! m_opConnsClose.empty()) {

+    m_mgrs.m_callMgr.requestTimeCall(this, Time::now());

+    return;

+  }

+

   // no time step requested by game

   if (! m_haveTimeStep) {

     m_mgrs.m_callMgr.cancelTimeCall(this);

@@ -6,6 +6,7 @@

 #ifndef BLINKER_GAME_H

 #define BLINKER_GAME_H

+#include <set>

 #include <string>

 #include <vector>

@@ -18,6 +19,7 @@

 #include "FormatFile.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "OpConn.h"

 #include "OutStreamFile.h"

 #include "Time.h"

 #include "TimeCallee.h"

@@ -39,6 +41,10 @@ protected:

     unsigned int maximum;

   };

+private:

+  /// set of operator connections

+  typedef std::set<OpConn *> OpConnSet;

+

 public:

   /**

    * @brief constructor

@@ -184,6 +190,12 @@ protected:

   /// unset game time step - do timed action for game

   void unsetTimeStep();

+  /// request closing operator connection (NULL ok) (closed via time call)

+  void requestOpConnClose(OpConn *pConn);

+

+  /// remove operator connection from requests (call when op conn is closed)

+  void forgetOpConn(OpConn *pConn);

+

 private:

   /// (re-)create image buffer

   void createImgBuf();

@@ -207,6 +219,7 @@ protected:

 private:

   bool      m_haveTimeStep; ///< if a time step is pending

   Time      m_timeStepTime; ///< time of next time step

+  OpConnSet m_opConnsClose; ///< operator connections to be closed

 }; // class Canvas

 } // namespace Blinker

@@ -140,8 +140,9 @@ void Pong::newOpConn(const std::string &name, OpConn *pConn)

   else if (name == m_name + c_opConnSuffixRight && ! m_pConnRight) {

     m_pConnRight = pConn;

   }

-  // nothing happens

+  // close imcoming connection as soon as possible, nothing else happens

   else {

+    requestOpConnClose(pConn);

     return;

   }

@@ -191,6 +192,9 @@ void Pong::opConnRecvPlay(OpConn *pConn, const std::string &sound)

  */

 void Pong::opConnClose(OpConn *pConn)

 {

+  // remove coperator connection from requests (if it was in)

+  forgetOpConn(pConn);

+

   // left player leaves

   if (pConn == m_pConnLeft) {

     m_pConnLeft = NULL;

@@ -634,10 +638,12 @@ void Pong::gameOver()

 {

   // close open operator connections

   if (m_pConnLeft) {

+    forgetOpConn(m_pConnLeft); // remove from requests (if it was in)

     m_pConnLeft->close();

     m_pConnLeft = NULL;

   }

   if (m_pConnRight) {

+    forgetOpConn(m_pConnRight); // remove from requests (if it was in)

     m_pConnRight->close();

     m_pConnRight = NULL;

   }