Changeset 9127 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 2:24:43 PM (18 years ago)

Author:

bensch

Message:

presentation/src: mouse-cursor rocks everywhere

Location:

branches/presentation/src

Files:

• lib/gui/gl/glgui_handler.cc (modified) (2 diffs)
• story_entities/menu/game_menu.cc (modified) (13 diffs)

branches/presentation/src/lib/gui/gl/glgui_handler.cc

@@ -33 +33 @@
 /// TAKE THIS OUT OF HERE.
 #include "graphics_engine.h"
+#include "loading/resource_manager.h"
 
 namespace OrxGui
@@ -74 +75 @@
     this->_cursor->show();
     this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
+
+    _cursor->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
+
   }
 

branches/presentation/src/story_entities/menu/game_menu.cc

@@ -128 +128 @@
   this->levelsBox = NULL;
   this->networkBox = NULL;
-  
+
   this->clientNetworkBox = NULL;
   this->serverNetworkBox = NULL;
@@ -241 +241 @@
     {
       OrxGui::GLGuiBox * box = new OrxGui::GLGuiBox();
-      
+
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
       box->pack(clientButton);
@@ -249 +249 @@
       box->pack(serverButton);
       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
-      
+
       networkBox->pack( box );
     }
@@ -342 +342 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
-  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
 
   /* now call the underlying*/
@@ -520 +519 @@
     //this->serverNetworkBox = NULL;
   }
-  
+
   if ( !this->clientNetworkBox )
   {
@@ -528 +527 @@
       text->setText( "Host:" );
       this->clientNetworkBox->pack( text );
-      
+
       this->ipInputLine = new OrxGui::GLGuiInputLine( );
       this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) );
@@ -534 +533 @@
       this->ipInputLine->connect(SIGNAL(ipInputLine, enterPushed), this, SLOT(GameMenu, connectToServer));
       this->ipInputLine->select();
-      
+
       OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect");
       clientNetworkBox->pack(connectButton);
@@ -540 +539 @@
     }
   }
-  
+
   this->networkBox->pack( this->clientNetworkBox );
-  
+
   this->clientNetworkBox->showAll();
-  
+
   //this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -560 +559 @@
     //this->clientNetworkBox = NULL;
   }
-  
+
   if ( !this->serverNetworkBox )
   {
@@ -568 +567 @@
       text->setText( "Map:" );
       this->serverNetworkBox->pack( text );
-      
+
       OrxGui::GLGuiText * text2 = new OrxGui::GLGuiText();
       text2->setText( "Multiplayer TeamDeathMatch Arena" );
       this->serverNetworkBox->pack( text2 );
-      
+
       OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
       serverNetworkBox->pack(createButton);
@@ -578 +577 @@
     }
   }
-  
+
   this->networkBox->pack( this->serverNetworkBox );
-  
+
   this->serverNetworkBox->showAll();
-  
+
   //this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -592 +591 @@
 {
   PRINTF(0)("Connecting to %s\n", this->ipInputLine->_getText().c_str() );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
-  
+
   Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
-  
+
   this->startLevel( 5 );
 }
@@ -604 +603 @@
 {
   PRINTF(0)("Create server\n" );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->createServer( 9999 );
-  
+
   this->startLevel( 5 );
 }