twetzel59
/
CraftNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor items from defines to enum values.

master
twetzel59 2017-04-29 14:09:23 -04:00
parent c10a2fddc5
commit e8692a0b34
2 changed files with 134 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/item.c
View File

@ -3,60 +3,60 @@
const int items[] = {
// items the user can build
GRASS,
SAND,
STONE,
BRICK,
WOOD,
CEMENT,
DIRT,
PLANK,
SNOW,
GLASS,
COBBLE,
LIGHT_STONE,
DARK_STONE,
CHEST,
LEAVES,
TALL_GRASS,
YELLOW_FLOWER,
RED_FLOWER,
PURPLE_FLOWER,
SUN_FLOWER,
WHITE_FLOWER,
BLUE_FLOWER,
COLOR_00,
COLOR_01,
COLOR_02,
COLOR_03,
COLOR_04,
COLOR_05,
COLOR_06,
COLOR_07,
COLOR_08,
COLOR_09,
COLOR_10,
COLOR_11,
COLOR_12,
COLOR_13,
COLOR_14,
COLOR_15,
COLOR_16,
COLOR_17,
COLOR_18,
COLOR_19,
COLOR_20,
COLOR_21,
COLOR_22,
COLOR_23,
COLOR_24,
COLOR_25,
COLOR_26,
COLOR_27,
COLOR_28,
COLOR_29,
COLOR_30,
COLOR_31
Item_GRASS,
Item_SAND,
Item_STONE,
Item_BRICK,
Item_WOOD,
Item_CEMENT,
Item_DIRT,
Item_PLANK,
Item_SNOW,
Item_GLASS,
Item_COBBLE,
Item_LIGHT_STONE,
Item_DARK_STONE,
Item_CHEST,
Item_LEAVES,
Item_TALL_GRASS,
Item_YELLOW_FLOWER,
Item_RED_FLOWER,
Item_PURPLE_FLOWER,
Item_SUN_FLOWER,
Item_WHITE_FLOWER,
Item_BLUE_FLOWER,
Item_COLOR_00,
Item_COLOR_01,
Item_COLOR_02,
Item_COLOR_03,
Item_COLOR_04,
Item_COLOR_05,
Item_COLOR_06,
Item_COLOR_07,
Item_COLOR_08,
Item_COLOR_09,
Item_COLOR_10,
Item_COLOR_11,
Item_COLOR_12,
Item_COLOR_13,
Item_COLOR_14,
Item_COLOR_15,
Item_COLOR_16,
Item_COLOR_17,
Item_COLOR_18,
Item_COLOR_19,
Item_COLOR_20,
Item_COLOR_21,
Item_COLOR_22,
Item_COLOR_23,
Item_COLOR_24,
Item_COLOR_25,
Item_COLOR_26,
Item_COLOR_27,
Item_COLOR_28,
Item_COLOR_29,
Item_COLOR_30,
Item_COLOR_31
};
const int item_count = sizeof(items) / sizeof(int);
@ -141,37 +141,37 @@ const int plants[256] = {
54, // 23 - blue flower
};
int is_plant(int w) {
int is_plant(Item w) {
switch (w) {
case TALL_GRASS:
case YELLOW_FLOWER:
case RED_FLOWER:
case PURPLE_FLOWER:
case SUN_FLOWER:
case WHITE_FLOWER:
case BLUE_FLOWER:
case Item_TALL_GRASS:
case Item_YELLOW_FLOWER:
case Item_RED_FLOWER:
case Item_PURPLE_FLOWER:
case Item_SUN_FLOWER:
case Item_WHITE_FLOWER:
case Item_BLUE_FLOWER:
return 1;
default:
return 0;
}
}
int is_obstacle(int w) {
int is_obstacle(Item w) {
w = ABS(w);
if (is_plant(w)) {
return 0;
}
switch (w) {
case EMPTY:
case CLOUD:
case Item_EMPTY:
case Item_CLOUD:
return 0;
default:
return 1;
}
}
int is_transparent(int w) {
if (w == EMPTY) {
int is_transparent(Item w) {
if (w == Item_EMPTY) {
return 1;
}
w = ABS(w);
@ -179,8 +179,8 @@ int is_transparent(int w) {
return 1;
}
switch (w) {
case EMPTY:
case GLASS:
case Item_EMPTY:
case Item_GLASS:
//case LEAVES:
return 1;
default:
@ -188,10 +188,10 @@ int is_transparent(int w) {
}
}
int is_destructable(int w) {
int is_destructable(Item w) {
switch (w) {
case EMPTY:
case CLOUD:
case Item_EMPTY:
case Item_CLOUD:
return 0;
default:
return 1;

122
src/item.h
View File

@ -1,71 +1,73 @@
#ifndef _item_h_
#define _item_h_
#define EMPTY 0
#define GRASS 1
#define SAND 2
#define STONE 3
#define BRICK 4
#define WOOD 5
#define CEMENT 6
#define DIRT 7
#define PLANK 8
#define SNOW 9
#define GLASS 10
#define COBBLE 11
#define LIGHT_STONE 12
#define DARK_STONE 13
#define CHEST 14
#define LEAVES 15
#define CLOUD 16
#define TALL_GRASS 17
#define YELLOW_FLOWER 18
#define RED_FLOWER 19
#define PURPLE_FLOWER 20
#define SUN_FLOWER 21
#define WHITE_FLOWER 22
#define BLUE_FLOWER 23
#define COLOR_00 32
#define COLOR_01 33
#define COLOR_02 34
#define COLOR_03 35
#define COLOR_04 36
#define COLOR_05 37
#define COLOR_06 38
#define COLOR_07 39
#define COLOR_08 40
#define COLOR_09 41
#define COLOR_10 42
#define COLOR_11 43
#define COLOR_12 44
#define COLOR_13 45
#define COLOR_14 46
#define COLOR_15 47
#define COLOR_16 48
#define COLOR_17 49
#define COLOR_18 50
#define COLOR_19 51
#define COLOR_20 52
#define COLOR_21 53
#define COLOR_22 54
#define COLOR_23 55
#define COLOR_24 56
#define COLOR_25 57
#define COLOR_26 58
#define COLOR_27 59
#define COLOR_28 60
#define COLOR_29 61
#define COLOR_30 62
#define COLOR_31 63
typedef enum {
Item_EMPTY,
Item_GRASS,
Item_SAND,
Item_STONE,
Item_BRICK,
Item_WOOD,
Item_CEMENT,
Item_DIRT,
Item_PLANK,
Item_SNOW,
Item_GLASS,
Item_COBBLE,
Item_LIGHT_STONE,
Item_DARK_STONE,
Item_CHEST,
Item_LEAVES,
Item_CLOUD,
Item_TALL_GRASS,
Item_YELLOW_FLOWER,
Item_RED_FLOWER,
Item_PURPLE_FLOWER,
Item_SUN_FLOWER,
Item_WHITE_FLOWER,
Item_BLUE_FLOWER,
Item_COLOR_00,
Item_COLOR_01,
Item_COLOR_02,
Item_COLOR_03,
Item_COLOR_04,
Item_COLOR_05,
Item_COLOR_06,
Item_COLOR_07,
Item_COLOR_08,
Item_COLOR_09,
Item_COLOR_10,
Item_COLOR_11,
Item_COLOR_12,
Item_COLOR_13,
Item_COLOR_14,
Item_COLOR_15,
Item_COLOR_16,
Item_COLOR_17,
Item_COLOR_18,
Item_COLOR_19,
Item_COLOR_20,
Item_COLOR_21,
Item_COLOR_22,
Item_COLOR_23,
Item_COLOR_24,
Item_COLOR_25,
Item_COLOR_26,
Item_COLOR_27,
Item_COLOR_28,
Item_COLOR_29,
Item_COLOR_30,
Item_COLOR_31
} Item;
extern const int items[];
extern const int item_count;
extern const int blocks[256][6];
extern const int plants[256];
int is_plant(int w);
int is_obstacle(int w);
int is_transparent(int w);
int is_destructable(int w);
int is_plant(Item w);
int is_obstacle(Item w);
int is_transparent(Item w);
int is_destructable(Item w);
#endif