Differential D2284 Diff 9722 source/ps/GameSetup/GameSetup.cpp

Changeset View

Standalone View

source/ps/GameSetup/GameSetup.cpp

	Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Lines
	#include "renderer/Renderer.h"			#include "renderer/Renderer.h"
	#include "renderer/VertexBufferManager.h"			#include "renderer/VertexBufferManager.h"
	#include "renderer/ModelRenderer.h"			#include "renderer/ModelRenderer.h"
	#include "scriptinterface/ScriptInterface.h"			#include "scriptinterface/ScriptInterface.h"
	#include "scriptinterface/ScriptStats.h"			#include "scriptinterface/ScriptStats.h"
	#include "scriptinterface/ScriptConversions.h"			#include "scriptinterface/ScriptConversions.h"
	#include "scriptinterface/ScriptRuntime.h"			#include "scriptinterface/ScriptRuntime.h"
	#include "simulation2/Simulation2.h"			#include "simulation2/Simulation2.h"
				#if CONFIG2_LOBBY
	#include "lobby/IXmppClient.h"			#include "lobby/IXmppClient.h"
				#endif
	#include "soundmanager/scripting/JSInterface_Sound.h"			#include "soundmanager/scripting/JSInterface_Sound.h"
	#include "soundmanager/ISoundManager.h"			#include "soundmanager/ISoundManager.h"
	#include "tools/atlas/GameInterface/GameLoop.h"			#include "tools/atlas/GameInterface/GameLoop.h"
	#include "tools/atlas/GameInterface/View.h"			#include "tools/atlas/GameInterface/View.h"

	#if !(OS_WIN \|\| OS_MACOSX \|\| OS_ANDROID) // assume all other platforms use X11 for wxWidgets			#if !(OS_WIN \|\| OS_MACOSX \|\| OS_ANDROID) // assume all other platforms use X11 for wxWidgets
	#define MUST_INIT_X11 1			#define MUST_INIT_X11 1
	#include <X11/Xlib.h>			#include <X11/Xlib.h>
	▲ Show 20 Lines • Show All 622 Lines • ▼ Show 20 Lines
	{			{
	const bool hasRenderer = CRenderer::IsInitialised();			const bool hasRenderer = CRenderer::IsInitialised();

	if ((flags & SHUTDOWN_FROM_CONFIG))			if ((flags & SHUTDOWN_FROM_CONFIG))
	goto from_config;			goto from_config;

	EndGame();			EndGame();

				#if CONFIG2_LOBBY
	SAFE_DELETE(g_XmppClient);			SAFE_DELETE(g_XmppClient);
				#endif

	SAFE_DELETE(g_ModIo);			SAFE_DELETE(g_ModIo);

	ShutdownPs();			ShutdownPs();

	TIMER_BEGIN(L"shutdown TexMan");			TIMER_BEGIN(L"shutdown TexMan");
	delete &g_TexMan;			delete &g_TexMan;
	TIMER_END(L"shutdown TexMan");			TIMER_END(L"shutdown TexMan");
	▲ Show 20 Lines • Show All 952 Lines • Show Last 20 Lines