diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-11 17:28:27 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-11 17:28:27 +0200 |
| commit | a8665d204255b4b0ad9ae6982f77ecd5e053c1b6 (patch) | |
| tree | 5f7e58785f5175e7f067ffaf8f96d16272c92d1e /src/common/global.h | |
| parent | 8ffdf2583e4ea77731490dcaad51dbc08d7f26fa (diff) | |
| download | colobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.tar.gz colobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.tar.bz2 colobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.zip | |
Changed #defined constants to consts; typedef struct -> struct
Diffstat (limited to 'src/common/global.h')
| -rw-r--r-- | src/common/global.h | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/src/common/global.h b/src/common/global.h index 628660b..212b8b4 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -17,39 +17,43 @@ // global.h
-
-#define BUILD_FACTORY (1<<0) // factory
-#define BUILD_DERRICK (1<<1) // derrick
-#define BUILD_CONVERT (1<<2) // converter
-#define BUILD_RADAR (1<<3) // radar
-#define BUILD_ENERGY (1<<4) // factory of cells
-#define BUILD_NUCLEAR (1<<5) // nuclear power plant
-#define BUILD_STATION (1<<6) // base station
-#define BUILD_REPAIR (1<<7) // repair center
-#define BUILD_TOWER (1<<8) // defense tower
-#define BUILD_RESEARCH (1<<9) // research center
-#define BUILD_LABO (1<<10) // laboratory
-#define BUILD_PARA (1<<11) // lightning protection
-#define BUILD_INFO (1<<12) // information terminal
-#define BUILD_GFLAT (1<<16) // flat floor
-#define BUILD_FLAG (1<<17) // puts / removes colored flag
+enum BuildType
+{
+ BUILD_FACTORY = (1<<0), // factory
+ BUILD_DERRICK = (1<<1), // derrick
+ BUILD_CONVERT = (1<<2), // converter
+ BUILD_RADAR = (1<<3), // radar
+ BUILD_ENERGY = (1<<4), // factory of cells
+ BUILD_NUCLEAR = (1<<5), // nuclear power plant
+ BUILD_STATION = (1<<6), // base station
+ BUILD_REPAIR = (1<<7), // repair center
+ BUILD_TOWER = (1<<8), // defense tower
+ BUILD_RESEARCH = (1<<9), // research center
+ BUILD_LABO = (1<<10), // laboratory
+ BUILD_PARA = (1<<11), // lightning protection
+ BUILD_INFO = (1<<12), // information terminal
+ BUILD_GFLAT = (1<<16), // flat floor
+ BUILD_FLAG = (1<<17) // puts / removes colored flag
+};
// Do not change values was because of backups (bits = ...).
-
-#define RESEARCH_TANK (1<<0) // caterpillars
-#define RESEARCH_FLY (1<<1) // wings
-#define RESEARCH_CANON (1<<2) // cannon
-#define RESEARCH_TOWER (1<<3) // defense tower
-#define RESEARCH_ATOMIC (1<<4) // nuclear
-#define RESEARCH_THUMP (1<<5) // thumper
-#define RESEARCH_SHIELD (1<<6) // shield
-#define RESEARCH_PHAZER (1<<7) // phazer gun
-#define RESEARCH_iPAW (1<<8) // legs of insects
-#define RESEARCH_iGUN (1<<9) // cannon of insects
-#define RESEARCH_RECYCLER (1<<10) // recycler
-#define RESEARCH_SUBM (1<<11) // submarine
-#define RESEARCH_SNIFFER (1<<12) // sniffer
+enum ResearchType
+{
+ RESEARCH_TANK = (1<<0), // caterpillars
+ RESEARCH_FLY = (1<<1), // wings
+ RESEARCH_CANON = (1<<2), // cannon
+ RESEARCH_TOWER = (1<<3), // defense tower
+ RESEARCH_ATOMIC = (1<<4), // nuclear
+ RESEARCH_THUMP = (1<<5), // thumper
+ RESEARCH_SHIELD = (1<<6), // shield
+ RESEARCH_PHAZER = (1<<7), // phazer gun
+ RESEARCH_iPAW = (1<<8), // legs of insects
+ RESEARCH_iGUN = (1<<9), // cannon of insects
+ RESEARCH_RECYCLER = (1<<10), // recycler
+ RESEARCH_SUBM = (1<<11), // submarine
+ RESEARCH_SNIFFER = (1<<12) // sniffer
+};
extern long g_id; // unique identifier
extern long g_build; // constructible buildings
|