From: Durk Talsma <durk@localhost.(none)>
Date: Wed, 1 Jun 2011 18:46:34 +0000 (+0200)
Subject: Merge branch 'next' into durk-atc
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f9a5f921a4853f7e64d467d63e19acf8f6f84979;p=flightgear.git

Merge branch 'next' into durk-atc
Resolving merge conflicts indicated below.
Conflicts:
	src/ATC/CMakeLists.txt
	src/ATC/Makefile.am
	src/Main/fg_init.cxx
---

f9a5f921a4853f7e64d467d63e19acf8f6f84979
diff --cc src/ATC/CMakeLists.txt
index d7822c987,98b6a0d25..dd1c00396
--- a/src/ATC/CMakeLists.txt
+++ b/src/ATC/CMakeLists.txt
@@@ -1,9 -1,8 +1,9 @@@
  include(FlightGearComponent)
  
  set(SOURCES
- 	atis_mgr.cxx
 +	atc_mgr.cxx
  	trafficcontrol.cxx
+ 	CommStation.cxx
  	)
  	
  flightgear_component(ATC "${SOURCES}")
diff --cc src/ATC/Makefile.am
index fd5302aac,046428e83..522a82033
--- a/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@@ -1,9 -1,7 +1,9 @@@
  noinst_LIBRARIES = libATC.a
  
  libATC_a_SOURCES = \
- 	atis_mgr.cxx atis_mgr.hxx \
 -    CommStation.cxx CommStation.hxx \
 +	atcdialog.cxx atcdialog.hxx \
 +	atc_mgr.cxx atc_mgr.hxx \
++    	CommStation.cxx CommStation.hxx \
  	trafficcontrol.cxx trafficcontrol.hxx 
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff --cc src/Main/fg_init.cxx
index bccabc3c9,9fd101b65..d57338318
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@@ -75,9 -75,6 +75,7 @@@
  #include <AIModel/AIManager.hxx>
  
  #include <ATCDCL/ATCmgr.hxx>
- #include <ATCDCL/commlist.hxx>
- #include <ATC/atis_mgr.hxx>
 +#include <ATC/atc_mgr.hxx>
  
  #include <Autopilot/route_mgr.hxx>
  #include <Autopilot/autopilotgroup.hxx>
@@@ -1428,16 -1416,6 +1421,16 @@@ bool fgInitSubsystems() 
      globals->set_ATC_mgr(new FGATCMgr);
      globals->get_ATC_mgr()->init(); 
  
 +    ////////////////////////////////////////////////////////////////////
 +   // Initialize the ATC subsystem
 +    ////////////////////////////////////////////////////////////////////
 +    globals->add_subsystem("ATC", new FGATCManager, SGSubsystemMgr::POST_FDM);
 +    ////////////////////////////////////////////////////////////////////
 +    // Initialise the ATIS Subsystem
 +    ////////////////////////////////////////////////////////////////////
-     globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
++    //globals->add_subsystem("atis", new FGAtisManager, SGSubsystemMgr::POST_FDM);
 +
 +
      ////////////////////////////////////////////////////////////////////
      // Initialize multiplayer subsystem
      ////////////////////////////////////////////////////////////////////