-/*******************************************************************************
-
- 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>
Main::Main()
{
mDispatchHandler = Mf::core.addHandler("video.newcontext",
- boost::bind(&Main::contextRecreated));
+ boost::bind(&Main::contextCreated));
setupGL();
}
//glMatrixMode(GL_MODELVIEW);
}
-void Main::contextRecreated()
+void Main::contextCreated()
{
// whenever the context is destroyed and a new one created, it probably
// won't contain our state so we need to set that up again
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
<< " 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;
}
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();
return 0;
}
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-