reformatting

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 510a9b1b3a1e8bedc3f78926859842e32f3d8785..91a8d080ba04d14df9114e8a112f3ba179e4a63c 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <cstdlib>             // atexit, getenv
 #include <iostream>
@@ -206,7 +189,8 @@ void Main::contextCreated()
 
 void Main::printUsage()
 {
-       std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..."
+       std::cout << "Usage: "
+                         << PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..."
                          << std::endl
                          << "The alien-smashing action game." << std::endl
                          << std::endl
@@ -220,7 +204,7 @@ void Main::printUsage()
                          << "  fullscreen=true|false" << std::endl
                          << "      if true, uses the entire display" << std::endl
                          << "  framerate=num" << std::endl
-                         << "      the target number of frames per second" << std::endl
+                         << "      number of frames to draw per second" << std::endl
                          << std::endl
                          << "See documentation for more options." << std::endl;
 }
@@ -324,12 +308,14 @@ int main(int argc, char* argv[])
        Mf::settings.loadFromFiles(Main::getConfigPath());
        Mf::settings.parseArgs(argc, argv);
 
-       Mf::Log::Level logLevel;
-       if (Mf::settings.get("loglevel", logLevel)) Mf::Log::setLevel(logLevel);
+       Mf::Log::Level logLevel = Mf::Log::INFO;
+       Mf::settings.get("loglevel", logLevel);
+       Mf::Log::setLevel(logLevel);
 
        try
        {
-               Mf::Video video(PACKAGE_STRING, Mf::Resource::getPath(PACKAGE".png"));
+               Mf::Video video(PACKAGE_STRING,
+                                               Mf::Resource::getPath(PACKAGE".png"));
                MainP app = Main::alloc();
                Mf::core.push(app);
                Mf::core.run();
@@ -349,6 +335,3 @@ int main(int argc, char* argv[])
        return 0;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-