Skip to content

Commit 4e59eb4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into sort_soldiers
2 parents 79d594f + 0731b64 commit 4e59eb4

622 files changed

Lines changed: 1026 additions & 2254 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Basescape/BaseInfoState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
2+
* Copyright 2010-2016 OpenXcom Developers.
33
*
44
* This file is part of OpenXcom.
55
*

‎src/Basescape/BaseInfoState.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#pragma once
12
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
3+
* Copyright 2010-2016 OpenXcom Developers.
34
*
45
* This file is part of OpenXcom.
56
*
@@ -16,9 +17,6 @@
1617
* You should have received a copy of the GNU General Public License
1718
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1819
*/
19-
#ifndef OPENXCOM_BASEINFOSTATE_H
20-
#define OPENXCOM_BASEINFOSTATE_H
21-
2220
#include "../Engine/State.h"
2321

2422
namespace OpenXcom
@@ -83,5 +81,3 @@ class BaseInfoState : public State
8381
};
8482

8583
}
86-
87-
#endif

‎src/Basescape/BaseView.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
2+
* Copyright 2010-2016 OpenXcom Developers.
33
*
44
* This file is part of OpenXcom.
55
*

‎src/Basescape/BaseView.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#pragma once
12
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
3+
* Copyright 2010-2016 OpenXcom Developers.
34
*
45
* This file is part of OpenXcom.
56
*
@@ -16,9 +17,6 @@
1617
* You should have received a copy of the GNU General Public License
1718
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1819
*/
19-
#ifndef OPENXCOM_BASEVIEW_H
20-
#define OPENXCOM_BASEVIEW_H
21-
2220
#include "../Engine/InteractiveSurface.h"
2321

2422
namespace OpenXcom
@@ -101,5 +99,3 @@ class BaseView : public InteractiveSurface
10199
};
102100

103101
}
104-
105-
#endif

‎src/Basescape/BasescapeState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
2+
* Copyright 2010-2016 OpenXcom Developers.
33
*
44
* This file is part of OpenXcom.
55
*

‎src/Basescape/BasescapeState.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#pragma once
12
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
3+
* Copyright 2010-2016 OpenXcom Developers.
34
*
45
* This file is part of OpenXcom.
56
*
@@ -16,9 +17,6 @@
1617
* You should have received a copy of the GNU General Public License
1718
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1819
*/
19-
#ifndef OPENXCOM_BASESCAPESTATE_H
20-
#define OPENXCOM_BASESCAPESTATE_H
21-
2220
#include "../Engine/State.h"
2321

2422
namespace OpenXcom
@@ -94,5 +92,3 @@ class BasescapeState : public State
9492
};
9593

9694
}
97-
98-
#endif

‎src/Basescape/BuildFacilitiesState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
2+
* Copyright 2010-2016 OpenXcom Developers.
33
*
44
* This file is part of OpenXcom.
55
*

‎src/Basescape/BuildFacilitiesState.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#pragma once
12
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
3+
* Copyright 2010-2016 OpenXcom Developers.
34
*
45
* This file is part of OpenXcom.
56
*
@@ -16,9 +17,6 @@
1617
* You should have received a copy of the GNU General Public License
1718
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1819
*/
19-
#ifndef OPENXCOM_BUILDFACILITIESSTATE_H
20-
#define OPENXCOM_BUILDFACILITIESSTATE_H
21-
2220
#include <vector>
2321
#include "../Engine/State.h"
2422

@@ -63,5 +61,3 @@ class BuildFacilitiesState : public State
6361
};
6462

6563
}
66-
67-
#endif

‎src/Basescape/CraftArmorState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
2+
* Copyright 2010-2016 OpenXcom Developers.
33
*
44
* This file is part of OpenXcom.
55
*

‎src/Basescape/CraftArmorState.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#pragma once
12
/*
2-
* Copyright 2010-2015 OpenXcom Developers.
3+
* Copyright 2010-2016 OpenXcom Developers.
34
*
45
* This file is part of OpenXcom.
56
*
@@ -16,9 +17,6 @@
1617
* You should have received a copy of the GNU General Public License
1718
* along with OpenXcom. If not, see <http://www.gnu.org/licenses/>.
1819
*/
19-
#ifndef OPENXCOM_CRAFTARMORSTATE_H
20-
#define OPENXCOM_CRAFTARMORSTATE_H
21-
2220
#include "../Engine/State.h"
2321

2422
namespace OpenXcom
@@ -58,5 +56,3 @@ class CraftArmorState : public State
5856
};
5957

6058
}
61-
62-
#endif

0 commit comments

Comments
 (0)