minor tweaks to camera, show fps etc

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define GENERALS_ONLINE
+
 //#define GENERALS_ONLINE_GAMETYPE_GENERALS
 #define GENERALS_ONLINE_GAMETYPE_ZEROHOUR
 
@@ -33,4 +35,4 @@
 // annoying game assertions, we'll catch real things in the debugger
 #define DISABLE_DEBUG_CRASHING 1
 
-#define GENERALS_ONLINE_TEST_MAP_TRANSFER 1
+//#define GENERALS_ONLINE_TEST_MAP_TRANSFER 1

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp

@@ -341,6 +341,11 @@ AsciiString NGMPGame::generateLadderGameResultsPacket(void)
 
 void NGMPGame::launchGame(void)
 {
+	// TODO_NGMP: Better way of doing this, plus maybe load from file?
+	TheWritableGlobalData->m_benchmarkTimer = 999999999;
+	//TheWritableGlobalData->m_debugShowGraphicalFramerate = true;
+	TheWritableGlobalData->m_showMetrics = true;
+
 	setGameInProgress(TRUE);
 
 	for (Int i = 0; i < MAX_SLOTS; ++i)

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -93,6 +93,9 @@
 
 #include "W3DDevice/GameClient/camerashakesystem.h"
 
+#include "GameNetwork/GeneralsOnline/NextGenMP_defines.h"
+
+
 #include "WinMain.h"  /** @todo Remove this, it's only here because we
 													are using timeGetTime, but we can remove that
 													when we have our own timer */
@@ -1916,9 +1919,20 @@ void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
 	// MDC - we no longer want to rotate maps (design made all of them right to begin with)
 	//	m_defaultAngle = angle * M_PI/180.0f;
 	m_defaultPitchAngle = pitch;
-	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight*maxHeight;
+
+	// TODO_NGMP: Better way of doing this
+#if defined(GENERALS_ONLINE)
+	TheWritableGlobalData->m_minCameraHeight = 100.f;
+	TheWritableGlobalData->m_maxCameraHeight = 800.f;
+	m_minHeightAboveGround = 100.f;
+	m_maxHeightAboveGround = 600.f;
+	
+#endif
+
+	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight * maxHeight;
 	if (m_minHeightAboveGround > m_maxHeightAboveGround)
 		m_maxHeightAboveGround = m_minHeightAboveGround;
+
 }
 
 //-------------------------------------------------------------------------------------------------