Changeset 5298 in orxonox.OLD for trunk/src

Timestamp:

Oct 7, 2005, 12:48:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: output-issues

Location:

trunk/src

Files:

• lib/event/key_mapper.cc (modified) (1 diff)
• lib/gui/gui_audio.cc (modified) (6 diffs)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• util/loading/factory.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (1 diff)

trunk/src/lib/event/key_mapper.cc

@@ -191 +191 @@
       {
         *map[i].pValue = keyID;
-        PRINTF(0)("Mapping %s to id %i\n", name, keyID);
+        PRINTF(0)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(keyID), keyID);
         break;
       }

trunk/src/lib/gui/gui_audio.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -16 +16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -44 +44 @@
       Slider* musicVolume;      //!< A Slider for music volume.
       Slider* effectsVolume;    //!< A Slider for effects volume.
-      
+
       enableSound = new CheckButton(CONFIG_NAME_DISABLE_AUDIO);
       enableSound->setFlagName ("no-sound", 0);
@@ -53 +53 @@
       Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
       audioBox->fill(musicVolumeLabel);
-      musicVolume = new Slider("Music Volume", 0, 100);
+      musicVolume = new Slider(CONFIG_NAME_MUSIC_VOLUME, 0, 100);
       musicVolume->setFlagName("music-volume", "m", 80);
       musicVolume->setDescription("Sets the volume of the ingame music");
@@ -60 +60 @@
       Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
       audioBox->fill (effectsVolumeLabel);
-      effectsVolume = new Slider ("Effects Volume", 0, 100);
+      effectsVolume = new Slider (CONFIG_NAME_EFFECTS_VOLUME, 0, 100);
       effectsVolume->setFlagName ("effects-volume", "e", 80);
       effectsVolume->setDescription("Sets the volune of the ingame SoundEffects");
@@ -71 +71 @@
 }
 
-/** 
+/**
   *  Destructs the Audio-Stuff
 */

trunk/src/orxonox.cc

@@ -93 +93 @@
   delete Factory::getFirst();
   FastFactory::deleteAll();
-  ShellCommandBase::debug();
   ShellCommandClass::unregisterAllCommands();
-  ShellCommandBase::debug();
   LoadClassDescription::deleteAllDescriptions();
 

trunk/src/story_entities/world.cc

@@ -456 +456 @@
 
 
-  PhysicsEngine::getInstance()->debug();
+//  PhysicsEngine::getInstance()->debug();
 
 
@@ -474 +474 @@
 
 
-  ClassList::debug();
+//  ClassList::debug();
 
   this->music = NULL;//(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);

trunk/src/util/loading/factory.cc

@@ -69 +69 @@
   assert( factory != NULL);
 
-  PRINTF(4)("Registered factory for '%s'\n", factory->getName());
+  PRINTF(5)("Registered factory for '%s'\n", factory->getName());
 
   if( Factory::first == NULL)

trunk/src/util/loading/load_param.h

@@ -310 +310 @@
         (*pt2Object.*function)(elem);
       else
-        PRINTF(2)("%s of %s is empty", paramName, pt2Object->getClassName());
+        PRINTF(2)("%s of %s is empty\n", paramName, pt2Object->getClassName());
     }
     else