sc

diff --git a/projects/dumbclient/Game.cpp b/projects/dumbclient/Game.cpp
index 152cdfa9fd06bd1246aa9857c68dbcd34dfb3cba..113f3d490d8fd844accdbab7cc1c6ddef52c294e 100644 (file)
--- a/projects/dumbclient/Game.cpp
+++ b/projects/dumbclient/Game.cpp
@@ -544,11 +544,20 @@ void Game::createFrameListener(void){
 //-------------------------------------------------------------------------------------
 bool Game::frameRenderingQueued(const FrameEvent &evt)
 {
+    if(!processUnbufferedInput(evt))
+    {
+
+        cerr << "processUnbufferedInput == false\n";
+        return false;
+    }
+
+
     moveCats(evt);
     printStepsLeft();
     printPlayerScore();
     printTime();
 
+   
     gettimeofday(&curTime, NULL);
     Real t = curTime.tv_sec - msgTime.tv_sec;
     if (t > 2)
@@ -658,12 +667,7 @@ bool Game::frameRenderingQueued(const FrameEvent &evt)
     for (currentCat = firstCat; currentCat != NULL; currentCat = currentCat->next)
         currentCat->as->addTime(evt.timeSinceLastFrame);
                    
-    if(!processUnbufferedInput(evt))
-    {
-
-        cerr << "processUnbufferedInput == false\n";
-        return false;
-    }
+    
 
 
     // write my position and orientation to use by sending thread
@@ -1833,7 +1837,10 @@ void Game::registerScore(Player* playerA, Player* playerB, int action)
     gettimeofday(&newScore.timestamp, NULL);
     score.push_back(newScore);
     
-    if (playerB->PunchesReceived >= 10)
+    if (playerB->PunchesReceived >= 10 && localPlayer->PunchesDoneAck >= 10 &&
+                                            localPlayer->HandshakesDoneAck >= 10 &&
+                                            localPlayer->RPSDoneAck >= 10 &&
+                                            localPlayer->WavesDoneAck >= 10)
         playerB->dead = true;
    
     

diff --git a/src/PredictedState.cpp b/src/PredictedState.cpp
index f208cf647c17b2793218ad68d568d621d45630f5..0d1ff8504dbff7582403d3e7464778894107987f 100644 (file)
--- a/src/PredictedState.cpp
+++ b/src/PredictedState.cpp
@@ -346,7 +346,7 @@ bool PredictedState::collision(Player* player)
 
     for (current = localPlayer; current != NULL; current = current->next)
     {
-        if (current != player && pos.distance(current->playerNode->_getDerivedPosition()) < 60)
+        if (current != player && pos.distance(current->playerNode->_getDerivedPosition()) < 50)
             return 1;   
     }