diff --git a/.gitignore b/.gitignore index 6123f38..59d7bac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.a *.o .fuse_hidden* PixelWars diff --git a/Makefile b/Makefile index aede7ef..7a76bf8 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ endif all : $(BINARY) -purple/purple.$(LIB_PREFIX) : +purple/purple.$(LIB_PREFIX) : purple/*.c $(MAKE) -C purple -orange/orange.$(LIB_PREFIX) : +orange/orange.$(LIB_PREFIX) : orange/*.c $(MAKE) -C orange $(BINARY) : orange/orange.$(LIB_PREFIX) purple/purple.$(LIB_PREFIX) PixelWars_$(GENERATOR).$(LIB_PREFIX) diff --git a/orange/Makefile b/orange/Makefile index 0d5b73c..efc788f 100644 --- a/orange/Makefile +++ b/orange/Makefile @@ -20,7 +20,7 @@ endif all : $(TARGET).$(LIB_PREFIX) -$(TARGET).$(LIB_PREFIX) : +$(TARGET).$(LIB_PREFIX) : *.c $(CC) *.c -c $(FLAGS) $(AR) $(TARGET).$(LIB_PREFIX) *.o diff --git a/orange/orange.c b/orange/orange.c index d24f03e..47b6643 100644 --- a/orange/orange.c +++ b/orange/orange.c @@ -71,9 +71,6 @@ t_action orange_update(void* my_info, t_com* com_data, int success){ return action; } - if (com_data != NULL) - printf("%d\n",data->job); - orangeApplyAction(data,com_data); switch(data->job){ @@ -175,15 +172,21 @@ void orangePutEffect(t_orange_info* data){ void orangeCommunicateEffect(t_orange_info* data){ data->listening = 1; data->talking = 0; -} +} void orangeWaitEffect(t_orange_info* data, t_com* com_data){ switch(data->job){ case O_JOBLESS: - if ((data->listening == 1) && (com_data != NULL)){ + if ((com_data != NULL)){ if (com_data->data[0] == 1){ - data->job = com_data->data[1]; - data->listening = 0; + switch(com_data->data[1]){ + case O_GATHERER: + printf("Become a gatherer"); + data->job = O_GATHERER; + data->listening = 0; + data->aim = O_NO_AIM; + break; + } } } break;