Changeset 9494 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jul 27, 2006, 10:44:28 AM (18 years ago)

Author:

bensch

Message:

merged the proxy back

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• multi_player_world_data.cc (modified) (4 diffs)

trunk/src/story_entities/game_world.cc

@@ -414 +414 @@
     double currentFrame = Timer::getNow();
 
+    if (currentFrame - this->lastFrame < .01)
+    {
+      SDL_Delay(1000.0 * (0.01 - (currentFrame - lastFrame)));
+      currentFrame = Timer::getNow();
+    }
+
+
     frameTimesIndex = this->cycle % TICK_SMOOTH_VALUE;
     this->frameTimes[frameTimesIndex] = currentFrame - this->lastFrame;
@@ -469 +476 @@
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+      this->dataTank->objectManager->getObjectList(OM_GROUP_00));
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_02));
+      this->dataTank->objectManager->getObjectList(OM_GROUP_02));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_02),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+      this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
 
 
@@ -513 +520 @@
 {
 
-    // if this server is a dedicated server the game workd does not need to be drawn
+  // if this server is a dedicated server the game workd does not need to be drawn
   if( !GraphicsEngine::getInstance()->isDedicated())
   {
-  // render the reflection texture
-  this->renderPassReflection();
-  // redner the refraction texture
-  this->renderPassRefraction();
+    // render the reflection texture
+    this->renderPassReflection();
+    // redner the refraction texture
+    this->renderPassRefraction();
   }
   // render all

trunk/src/story_entities/multi_player_world_data.cc

@@ -112 +112 @@
   const TiXmlElement* element = NULL;
 
-  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
+  if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
   {
     /* load the spawning points */
@@ -148 +148 @@
     element = element->FirstChildElement();
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
+    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     {
       while( element != NULL)
@@ -206 +206 @@
 
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
+    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     {
       this->localPlayer = new Player();
@@ -284 +284 @@
 
   // create server playable
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );