Skip to content

Commit

Permalink
maintenance: removed deprecated files, linux friendly include names
Browse files Browse the repository at this point in the history
  • Loading branch information
tmj-fstate committed Oct 12, 2018
1 parent 66eb3ff commit 7933ade
Show file tree
Hide file tree
Showing 110 changed files with 235 additions and 5,741 deletions.
2 changes: 1 addition & 1 deletion AirCoupler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ obtain one at
#include "stdafx.h"
#include "AirCoupler.h"

#include "model3d.h"
#include "Model3d.h"
#include "parser.h"

TAirCoupler::TAirCoupler()
Expand Down
2 changes: 1 addition & 1 deletion AirCoupler.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ obtain one at

#pragma once

#include "classes.h"
#include "Classes.h"

class TAirCoupler
{
Expand Down
2 changes: 1 addition & 1 deletion AnimModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ obtain one at
#include "MdlMngr.h"
#include "simulation.h"
#include "simulationtime.h"
#include "event.h"
#include "Event.h""
#include "Globals.h"
#include "Timer.h"
#include "Logs.h"
Expand Down
8 changes: 4 additions & 4 deletions AnimModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ obtain one at

#pragma once

#include "classes.h"
#include "Classes.h"
#include "dumb3d.h"
#include "float3d.h"
#include "model3d.h"
#include "dynobj.h"
#include "Float3d.h"
#include "Model3d.h"
#include "DynObj.h"
#include "scenenode.h"

const int iMaxNumLights = 8;
Expand Down
2 changes: 1 addition & 1 deletion Button.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ obtain one at
#include "parser.h"
#include "Model3d.h"
#include "Console.h"
#include "logs.h"
#include "Logs.h"
#include "renderer.h"

void TButton::Clear(int i)
Expand Down
2 changes: 1 addition & 1 deletion Camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ obtain one at
#include "utilities.h"
#include "Console.h"
#include "Timer.h"
#include "mover.h"
#include "MOVER.h"

//---------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions Driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ obtain one at
#include <direct.h>
#include "Globals.h"
#include "Logs.h"
#include "train.h"
#include "Train.h"
#include "mtable.h"
#include "DynObj.h"
#include "Event.h"
#include "MemCell.h"
#include "simulation.h"
#include "simulationtime.h"
#include "track.h"
#include "Track.h"
#include "station.h"
#include "keyboardinput.h"
#include "utilities.h"
Expand Down
4 changes: 2 additions & 2 deletions Driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ obtain one at

#include <string>
#include "Classes.h"
#include "mczapkie/mover.h"
#include "MOVER.h"
#include "sound.h"
#include "dynobj.h"
#include "DynObj.h"

enum TOrders
{ // rozkazy dla AI
Expand Down
10 changes: 5 additions & 5 deletions DynObj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ obtain one at
#include "DynObj.h"

#include "simulation.h"
#include "camera.h"
#include "train.h"
#include "driver.h"
#include "Camera.h"
#include "Train.h"
#include "Driver.h"
#include "Globals.h"
#include "Timer.h"
#include "logs.h"
#include "Logs.h"
#include "Console.h"
#include "MdlMngr.h"
#include "model3d.h"
#include "Model3d.h"
#include "renderer.h"
#include "uitranscripts.h"
#include "messaging.h"
Expand Down
4 changes: 2 additions & 2 deletions DynObj.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ obtain one at
#include <string>
#include <functional>

#include "classes.h"
#include "Classes.h"
#include "material.h"
#include "mczapkie/mover.h"
#include "MOVER.h"
#include "TrkFoll.h"
#include "Button.h"
#include "AirCoupler.h"
Expand Down
2 changes: 1 addition & 1 deletion EU07.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#include "stdafx.h"

#include "application.h"
#include "logs.h"
#include "Logs.h"

#ifdef _MSC_VER
#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
Expand Down
22 changes: 11 additions & 11 deletions Event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ obtain one at
*/

#include "stdafx.h"
#include "event.h"
#include "Event.h""

#include "simulation.h"
#include "messaging.h"
#include "globals.h"
#include "memcell.h"
#include "track.h"
#include "traction.h"
#include "tractionpower.h"
#include "Globals.h"
#include "MemCell.h"
#include "Track.h"
#include "Traction.h"
#include "TractionPower.h"
#include "sound.h"
#include "animmodel.h"
#include "dynobj.h"
#include "driver.h"
#include "timer.h"
#include "logs.h"
#include "AnimModel.h"
#include "DynObj.h"
#include "Driver.h"
#include "Timer.h"
#include "Logs.h"

void
basic_event::event_conditions::bind( basic_event::node_sequence *Nodes ) {
Expand Down
6 changes: 3 additions & 3 deletions Event.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ obtain one at

#pragma once

#include "classes.h"
#include "Classes.h"
#include "scene.h"
#include "names.h"
#include "evlaunch.h"
#include "Names.h"
#include "EvLaunch.h"

// common event interface
class basic_event {
Expand Down
2 changes: 1 addition & 1 deletion Float3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ obtain one at
*/

#include "stdafx.h"
#include "float3d.h"
#include "Float3d.h"
#include "sn_utils.h"

//---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Gauge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ obtain one at
#include "parser.h"
#include "Model3d.h"
#include "Timer.h"
#include "logs.h"
#include "Logs.h"
#include "renderer.h"

TGauge::TGauge( sound_source const &Soundtemplate ) :
Expand Down
6 changes: 3 additions & 3 deletions Globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ obtain one at

*/
#include "stdafx.h"
#include "globals.h"
#include "Globals.h"

#include "simulation.h"
#include "simulationenvironment.h"
#include "driver.h"
#include "logs.h"
#include "Driver.h"
#include "Logs.h"
#include "Console.h"
#include "PyInt.h"

Expand Down
6 changes: 3 additions & 3 deletions Globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ obtain one at

#pragma once

#include "classes.h"
#include "camera.h"
#include "Classes.h"
#include "Camera.h"
#include "dumb3d.h"
#include "float3d.h"
#include "Float3d.h"
#include "light.h"
#include "uart.h"
#include "utilities.h"
Expand Down
10 changes: 5 additions & 5 deletions McZapkie/Mover.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ obtain one at
*/

#include "stdafx.h"
#include "Mover.h"
#include "MOVER.h"

#include "Oerlikon_ESt.h"
#include "../utilities.h"
#include "../globals.h"
#include "../logs.h"
#include "../parser.h"
#include "utilities.h"
#include "Globals.h"
#include "Logs.h"
#include "parser.h"
//---------------------------------------------------------------------------

// Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane.
Expand Down
2 changes: 1 addition & 1 deletion McZapkie/hamulce.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Copyright (C) 2007-2014 Maciej Cierniak
#include "stdafx.h"
#include "hamulce.h"
#include <typeinfo>
#include "Mover.h"
#include "MOVER.h"
#include "utilities.h"

//---FUNKCJE OGOLNE---
Expand Down
4 changes: 2 additions & 2 deletions MdlMngr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ obtain one at
#include "stdafx.h"
#include "MdlMngr.h"

#include "model3d.h"
#include "Model3d.h"
#include "Globals.h"
#include "logs.h"
#include "Logs.h"
#include "utilities.h"

// wczytanie modelu do kontenerka
Expand Down
2 changes: 1 addition & 1 deletion MdlMngr.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ obtain one at
*/
#pragma once

#include "classes.h"
#include "Classes.h"

class TMdlContainer {
friend class TModelsManager;
Expand Down
8 changes: 4 additions & 4 deletions MemCell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ obtain one at
*/

#include "stdafx.h"
#include "memcell.h"
#include "MemCell.h"

#include "simulation.h"
#include "driver.h"
#include "event.h"
#include "logs.h"
#include "Driver.h"
#include "Event.h""
#include "Logs.h"

//---------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion MemCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ obtain one at

#include "Classes.h"
#include "scenenode.h"
#include "names.h"
#include "Names.h"

class TMemCell : public scene::basic_node {

Expand Down
2 changes: 1 addition & 1 deletion Model3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others
#include "Model3d.h"

#include "Globals.h"
#include "logs.h"
#include "Logs.h"
#include "utilities.h"
#include "renderer.h"
#include "Timer.h"
Expand Down
2 changes: 1 addition & 1 deletion Model3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ obtain one at

#pragma once

#include "classes.h"
#include "Classes.h"
#include "dumb3d.h"
#include "Float3d.h"
#include "openglgeometrybank.h"
Expand Down
2 changes: 1 addition & 1 deletion PyInt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ obtain one at
#include "stdafx.h"
#include "PyInt.h"

#include "globals.h"
#include "Globals.h"
#include "application.h"
#include "renderer.h"
#include "Logs.h"
Expand Down
2 changes: 1 addition & 1 deletion Segment.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ obtain one at

#pragma once

#include "classes.h"
#include "Classes.h"
#include "dumb3d.h"
#include "openglgeometrybank.h"
#include "utilities.h"
Expand Down
6 changes: 3 additions & 3 deletions Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ obtain one at
*/

#include "stdafx.h"
#include "texture.h"
#include "Texture.h""

#include <ddraw.h>
#include "GL/glew.h"

#include "utilities.h"
#include "globals.h"
#include "logs.h"
#include "Globals.h"
#include "Logs.h"
#include "sn_utils.h"

#define EU07_DEFERRED_TEXTURE_UPLOAD
Expand Down
16 changes: 8 additions & 8 deletions Track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ obtain one at
*/

#include "stdafx.h"
#include "track.h"
#include "Track.h"

#include "simulation.h"
#include "globals.h"
#include "event.h"
#include "Globals.h"
#include "Event.h""
#include "messaging.h"
#include "dynobj.h"
#include "animmodel.h"
#include "track.h"
#include "timer.h"
#include "logs.h"
#include "DynObj.h"
#include "AnimModel.h"
#include "Track.h"
#include "Timer.h"
#include "Logs.h"
#include "renderer.h"

// 101206 Ra: trapezoidalne drogi i tory
Expand Down
4 changes: 2 additions & 2 deletions Track.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ obtain one at
#include <vector>
#include <deque>

#include "classes.h"
#include "Classes.h"
#include "Segment.h"
#include "material.h"
#include "scenenode.h"
#include "names.h"
#include "Names.h"

namespace scene {
class basic_cell;
Expand Down
Loading

0 comments on commit 7933ade

Please sign in to comment.