[Orxonox-commit 2105] r6821 - code/branches/fps/src/libraries/tools/fps

[landauf at orxonox.net]

Author: landauf
Date: 2010-05-02 23:28:23 +0200 (Sun, 02 May 2010)
New Revision: 6821

Removed:
   code/branches/fps/src/libraries/tools/fps/main.cpp
   code/branches/fps/src/libraries/tools/fps/misc.cpp
Modified:
   code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp
   code/branches/fps/src/libraries/tools/fps/Q3Map.h
Log:
BZN bsp renderer: removed JarDebug.h includes and deleted main.cpp and misc.cpp

Modified: code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp
===================================================================
--- code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp	2010-05-02 21:24:04 UTC (rev 6820)
+++ code/branches/fps/src/libraries/tools/fps/OgreFramework.hpp	2010-05-02 21:28:23 UTC (rev 6821)
@@ -60,7 +60,7 @@
 
 #include "Q3Map.h"
 
-#include "JarDebug.h" //!! just for debugging, remove from final build
+//#include "JarDebug.h" //!! just for debugging, remove from final build
 
 
 #define CHECKDELETE_ARRAY(x, y)		if(x) { delete [] x ; x=0 ; m_nNewCount-- ; m_nNewCheck[y]-- ;}

Modified: code/branches/fps/src/libraries/tools/fps/Q3Map.h
===================================================================
--- code/branches/fps/src/libraries/tools/fps/Q3Map.h	2010-05-02 21:24:04 UTC (rev 6820)
+++ code/branches/fps/src/libraries/tools/fps/Q3Map.h	2010-05-02 21:28:23 UTC (rev 6821)
@@ -35,7 +35,7 @@
 
 #include "Q3Map_misc.h"
 
-#include "JarDebug.h" //!! just for debugging, remove from final build
+//#include "JarDebug.h" //!! just for debugging, remove from final build
 
 #define MEMADD	65536 // memory is grown in 66k blocks
 #define MAX_TOKENSIZE 1024 // make sure tokens in texts aren't ridiculously large

Deleted: code/branches/fps/src/libraries/tools/fps/main.cpp
===================================================================
--- code/branches/fps/src/libraries/tools/fps/main.cpp	2010-05-02 21:24:04 UTC (rev 6820)
+++ code/branches/fps/src/libraries/tools/fps/main.cpp	2010-05-02 21:28:23 UTC (rev 6821)
@@ -1,35 +0,0 @@
-//|||||||||||||||||||||||||||||||||||||||||||||||
-
-#include "DemoApp.hpp"
-
-//|||||||||||||||||||||||||||||||||||||||||||||||
-
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-
-//|||||||||||||||||||||||||||||||||||||||||||||||
-
-INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
-int main(int argc, char **argv)
-#endif
-{
-	try
-    {
-		DemoApp demo;
-		demo.startDemo();
-    }
-	catch(std::exception& e)
-    {
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-        MessageBoxA(NULL, e.what(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
-        fprintf(stderr, "An exception has occurred: %s\n", e.getFullDescription().c_str());
-#endif
-    }
-
-    return 0;
-}
-
-//|||||||||||||||||||||||||||||||||||||||||||||||

Deleted: code/branches/fps/src/libraries/tools/fps/misc.cpp
===================================================================
--- code/branches/fps/src/libraries/tools/fps/misc.cpp	2010-05-02 21:24:04 UTC (rev 6820)
+++ code/branches/fps/src/libraries/tools/fps/misc.cpp	2010-05-02 21:28:23 UTC (rev 6821)
@@ -1,32 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2008 Daniel Örstadius
-
-This file is part of bsp-renderer source code.
-
-bsp-renderer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-bsp-renderer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with bsp-renderer.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-// misc.cpp -- various definitions and functions
-
-#include "misc.h"
-
-void exitFunction(string reason)
-{
-  cerr << "\n" << reason << "\n";
-  cerr << "exiting\n";
-  Sleep(3000);
-  exit(1);
-}