mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 14:27:16 +00:00
(svn r11827) -Codechange: do not include enum_type.hpp unnecessary.
This commit is contained in:
parent
aa1d429d7f
commit
a78d73805f
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "core/enum_type.hpp"
|
||||||
|
|
||||||
void FioSeekTo(uint32 pos, int mode);
|
void FioSeekTo(uint32 pos, int mode);
|
||||||
void FioSeekToFile(uint8 slot, uint32 pos);
|
void FioSeekToFile(uint8 slot, uint32 pos);
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
#define VARDEF extern
|
#define VARDEF extern
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "core/enum_type.hpp"
|
|
||||||
#include "strings_type.h"
|
#include "strings_type.h"
|
||||||
|
|
||||||
// Forward declarations of structs.
|
// Forward declarations of structs.
|
||||||
@ -95,10 +94,6 @@ enum TransportType {
|
|||||||
INVALID_TRANSPORT = 0xff,
|
INVALID_TRANSPORT = 0xff,
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Define basic enum properties */
|
|
||||||
template <> struct EnumPropsT<TransportType> : MakeEnumPropsT<TransportType, byte, TRANSPORT_BEGIN, TRANSPORT_END, INVALID_TRANSPORT> {};
|
|
||||||
typedef TinyEnumT<TransportType> TransportTypeByte;
|
|
||||||
|
|
||||||
/* Display Options */
|
/* Display Options */
|
||||||
enum {
|
enum {
|
||||||
DO_SHOW_TOWN_NAMES = 0,
|
DO_SHOW_TOWN_NAMES = 0,
|
||||||
|
@ -55,7 +55,7 @@ struct TrackPathFinder {
|
|||||||
|
|
||||||
TrackdirByte the_dir;
|
TrackdirByte the_dir;
|
||||||
|
|
||||||
TransportTypeByte tracktype;
|
TransportType tracktype;
|
||||||
uint sub_type;
|
uint sub_type;
|
||||||
|
|
||||||
byte var2;
|
byte var2;
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
#ifndef PLAYER_TYPE_H
|
#ifndef PLAYER_TYPE_H
|
||||||
#define PLAYER_TYPE_H
|
#define PLAYER_TYPE_H
|
||||||
|
|
||||||
|
#include "core/enum_type.hpp"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enum for all players/owners.
|
* Enum for all players/owners.
|
||||||
*/
|
*/
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
#ifndef RAIL_TYPE_H
|
#ifndef RAIL_TYPE_H
|
||||||
#define RAIL_TYPE_H
|
#define RAIL_TYPE_H
|
||||||
|
|
||||||
|
#include "core/enum_type.hpp"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enumeration for all possible railtypes.
|
* Enumeration for all possible railtypes.
|
||||||
*
|
*
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
/** @file table/namegen.h Namepart tables for the town name generator */
|
/** @file table/namegen.h Namepart tables for the town name generator */
|
||||||
|
|
||||||
#include "../stdafx.h"
|
#include "../stdafx.h"
|
||||||
#include "../openttd.h"
|
#include "../core/enum_type.hpp"
|
||||||
|
|
||||||
static const char *name_original_english_1[] = {
|
static const char *name_original_english_1[] = {
|
||||||
"Great ",
|
"Great ",
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
#ifndef TRACK_TYPE_H
|
#ifndef TRACK_TYPE_H
|
||||||
#define TRACK_TYPE_H
|
#define TRACK_TYPE_H
|
||||||
|
|
||||||
|
#include "core/enum_type.hpp"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* These are used to specify a single track.
|
* These are used to specify a single track.
|
||||||
* Can be translated to a trackbit with TrackToTrackbit
|
* Can be translated to a trackbit with TrackToTrackbit
|
||||||
|
Loading…
Reference in New Issue
Block a user