[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3853 - in trunk/pingus/src: . sound
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3853 - in trunk/pingus/src: . sound |
Date: |
Thu, 17 Jul 2008 15:14:20 +0200 |
Author: grumbel
Date: 2008-07-17 15:14:19 +0200 (Thu, 17 Jul 2008)
New Revision: 3853
Modified:
trunk/pingus/src/collision_map.cpp
trunk/pingus/src/game_session.cpp
trunk/pingus/src/globals.cpp
trunk/pingus/src/globals.hpp
trunk/pingus/src/sound/sound.cpp
trunk/pingus/src/system.cpp
trunk/pingus/src/system.hpp
Log:
Removed verbose flag
Modified: trunk/pingus/src/collision_map.cpp
===================================================================
--- trunk/pingus/src/collision_map.cpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/collision_map.cpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -112,11 +112,6 @@
{
colmap[x+y*width] = p;
}
- else
- {
- if (verbose > 2)
- std::cout << "CollisionMap: remove: Out of map" << std::endl;
- }
}
bool
@@ -144,11 +139,6 @@
if ((sur_x > width) || (sur_y > height))
{
- if (verbose > 3)
- {
- std::cout << "Warning: CollisionMap: Spot out of screen" << std::endl;
- std::cout << "sur_x: " << sur_x << " sur_y: " << sur_y << std::endl;
- }
return;
}
Modified: trunk/pingus/src/game_session.cpp
===================================================================
--- trunk/pingus/src/game_session.cpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/game_session.cpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -329,10 +329,6 @@
{
Sound::PingusSound::play_music(server->get_plf().get_music());
}
-
- if (verbose)
- std::cout << "GameSession: Entering main_loop. Startup time: "
- << SDL_GetTicks() << " msec." << std::endl;
}
void
Modified: trunk/pingus/src/globals.cpp
===================================================================
--- trunk/pingus/src/globals.cpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/globals.cpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -19,7 +19,6 @@
int game_speed = 20;
float desired_fps = 40;
bool print_fps = false;
-int verbose = 0;
bool music_enabled = true;
bool sound_enabled = true;
int fast_forward_time_scale = 4;
Modified: trunk/pingus/src/globals.hpp
===================================================================
--- trunk/pingus/src/globals.hpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/globals.hpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -26,7 +26,6 @@
extern int game_speed; ///< -t, --set-speed
extern float desired_fps; ///< -k, --set-fps
extern bool print_fps; ///< --print-fps
-extern int verbose; ///< -v, --verbose
extern bool music_enabled; ///< -m, --enable-music
extern bool sound_enabled; ///< -s, --enable-sound
Modified: trunk/pingus/src/sound/sound.cpp
===================================================================
--- trunk/pingus/src/sound/sound.cpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/sound/sound.cpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -33,9 +33,6 @@
{
if (sound_enabled || music_enabled)
{
- if (verbose)
- std::cout << "Init Sound" << std::endl;
-
try {
PingusSound::init (new PingusSoundReal ());
} catch (const std::exception& err) {
@@ -46,8 +43,6 @@
}
else
{
- if (verbose)
- std::cout << "Sound disabled" << std::endl;
PingusSound::init (new PingusSoundDummy ());
}
}
Modified: trunk/pingus/src/system.cpp
===================================================================
--- trunk/pingus/src/system.cpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/system.cpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -49,8 +49,6 @@
#include "string_util.hpp"
#include "gettext.h"
-
-int System::verbose;
std::string System::userdir;
std::string System::default_email;
std::string System::default_username;
@@ -225,17 +223,12 @@
std::cout << "Successfully created: " << directory << std::endl;
}
}
- else
- {
- if (verbose) std::cout << "Found: " << directory << std::endl;
- }
#else
if (!CreateDirectory(directory.c_str(), 0))
{
DWORD dwError = GetLastError();
if (dwError == ERROR_ALREADY_EXISTS)
{
- if (verbose) std::cout << "Found: " << directory << std::endl;
}
else if (dwError == ERROR_PATH_NOT_FOUND)
{
Modified: trunk/pingus/src/system.hpp
===================================================================
--- trunk/pingus/src/system.hpp 2008-07-17 13:02:53 UTC (rev 3852)
+++ trunk/pingus/src/system.hpp 2008-07-17 13:14:19 UTC (rev 3853)
@@ -30,7 +30,6 @@
class System
{
private:
- static int verbose;
static std::string default_email;
static std::string default_username;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3853 - in trunk/pingus/src: . sound,
grumbel at BerliOS <=