Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2007-10-21 15:16:27 +0000
committerStijn Buys <ingar@osirion.org>2007-10-21 15:16:27 +0000
commit783545505aa51e4f908932fffb1f8362ad898d44 (patch)
tree84bb8738254d65057dd34f173a708ea0f3ef2fc3 /src/client/main.cc
parentf936192f3689e58f9c72e19dd6f736f6b2449906 (diff)
Fixed camera
Added alpha blending to background
Diffstat (limited to 'src/client/main.cc')
-rw-r--r--src/client/main.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/main.cc b/src/client/main.cc
index 66e0fa3..696c02f 100644
--- a/src/client/main.cc
+++ b/src/client/main.cc
@@ -1,4 +1,4 @@
-/* main.cc
+/* client/main.cc
This file is part of the Osirion project and is distributed under
the terms and conditions of the GNU General Public License version 2
*/
@@ -10,21 +10,21 @@
#include <iostream>
// project headers
-#include "common/osirion.h"
+#include "osirion.h"
#include "game/game.h"
#include "input.h"
#include "video.h"
-void quit(int exit_code)
+void quit(int status)
{
SDL_Quit();
- exit(exit_code);
+ exit(status);
}
int main( int argc, char *argv[] )
{
- std::cout << "The Osirion project " << OSIRION_VERSION << std::endl;
+ std::cout << "Project::OSiRiON " << OSIRION_VERSION << std::endl;
// Initialize the video subsystem
video::init();
@@ -39,7 +39,7 @@ int main( int argc, char *argv[] )
game::init();
Uint32 startup = SDL_GetTicks();
- while(game::initialized) {
+ while(game::initialized) {
Uint32 chrono = SDL_GetTicks();
// overflow protection ~49 days