Blinker

@@ -93,6 +93,12 @@ void Game::deactivate()

   sendFrame();

 }

+/// check if game is active

+bool Game::isActive() const

+{

+  return ! m_imgBuf.empty(); // game is active if there is an image buffer

+}

+

 /// set pixel in image buffer

 void Game::pixel(int y, int x, ColorData const &cd)

 {

@@ -68,6 +68,9 @@ protected:

   /// deactivate game: tear down image buffer, deactivate output

   void deactivate();

+  /// check if game is active

+  bool isActive() const;

+

   /// check if integer is between minimum and maximum values

   static bool checkLimitInt(int i, int min, int max)

   {

@@ -52,9 +52,6 @@ Pong::Pong(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   // open operator connection interfaces for left and right player

   m_mgrs.m_opMgr.open(m_name + OpConnSuffixLeft, this);

   m_mgrs.m_opMgr.open(m_name + OpConnSuffixRight, this);

-

-  // FIXME: activate at begin for initial development only

-  activate();

 }

 /// virtual destructor

@@ -125,15 +122,24 @@ void Pong::newOpConn(const std::string &name, OpConn *pConn)

   // left player joins if none there yet

   if (name == m_name + OpConnSuffixLeft && ! m_pConnLeft) {

     m_pConnLeft = pConn;

-    redraw(); // player color is different for phone / computer

-    return;

   }

   // right player joins if none there yet

-  if (name == m_name + OpConnSuffixRight && ! m_pConnRight) {

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

     m_pConnRight = pConn;

-    redraw(); // player color is different for phone / computer

+  }

+  // nothing happens

+  else {

     return;

   }

+

+  // already active

+  if (isActive()) {

+    redraw(); // player color is different for phone / computer

+  }

+  // first player joined

+  else {

+    activate();

+  }

 }

 /**

@@ -146,12 +152,10 @@ void Pong::opConnRecvKey(OpConn *pConn, char key)

   // left player

   if (pConn == m_pConnLeft) {

     processKey(key, m_leftPosY);

-    return;

   }

   // right player

-  if (pConn == m_pConnRight) {

+  else if (pConn == m_pConnRight) {

     processKey(key, m_rightPosY);

-    return;

   }

 }

@@ -177,15 +181,24 @@ void Pong::opConnClose(OpConn *pConn)

   // left player leaves

   if (pConn == m_pConnLeft) {

     m_pConnLeft = NULL;

-    redraw(); // player color is different for phone / computer

-    return;

   }

   // right player leaves

-  if (pConn == m_pConnRight) {

+  else if (pConn == m_pConnRight) {

     m_pConnRight = NULL;

-    redraw(); // player color is different for phone / computer

+  }

+  // nothing happens

+  else {

     return;

   }

+

+  // still a phone player there

+  if (m_pConnLeft || m_pConnRight) {

+    redraw(); // player color is different for phone / computer

+  }

+  // no phone players left

+  else {

+    deactivate();

+  }

 }

 /// re-initialize game (e.g. due to config change)

@@ -204,7 +217,11 @@ void Pong::reinitialize()

   color2data(m_filePadColor, m_padColor);

   color2data(m_fileComputerColor, m_computerColor);

-  // FIXME: start ball for development

+  // reset scores

+  m_scoreLeft = 0;

+  m_scoreRight = 0;

+

+  // start first ball

   startBall();

 }

@@ -241,7 +258,7 @@ void Pong::redraw()

 void Pong::timeCall()

 {

   // game is running

-  if (m_goalDelay <= 0 && m_ballPosX >= 0 && m_ballPosY >= 0) {

+  if (m_goalDelay <= 0) {

     // computer player: move pads

     if (! m_pConnLeft) {

@@ -528,8 +545,8 @@ void Pong::detectGoal()

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

 void Pong::planTimeCall()

 {

-  // no time call needed if game is not running

-  if (m_ballPosX < 0 ||  m_ballPosY < 0) {

+  // no time call needed if not active

+  if (! isActive()) {

     m_mgrs.m_callMgr.cancelTimeCall(this);

     return;

   }

@@ -544,27 +561,6 @@ void Pong::planTimeCall()

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

 }

-/// move ball out of the field and halt it

-void Pong::hideBall()

-{

-  m_ballPosX = -1;

-  m_ballPosY = -1;

-  m_ballDirX = 0;

-  m_ballDirY = 0;

-

-  // no delays, ball has not bounced at pad

-  m_leftDelay = 0;

-  m_rightDelay = 0;

-  m_goalDelay = 0;

-  m_bounceCnt = 0;

-

-  // draw and send frame

-  redraw();

-

-  // update time call request

-  planTimeCall();

-}

-

 /// start ball

 void Pong::startBall()

 {

@@ -158,9 +158,6 @@ protected:

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

   void planTimeCall();

-  /// move ball out of the field and halt it

-  void hideBall();

-

   /// start ball

   void startBall();