EpicSparrow/PixelWars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recursive make ok

Browse Source
This commit is contained in:
Lendemor 2015-01-22 14:49:13 +01:00
parent 178629a9ad
commit 1147e0267f
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.a
*.o
.fuse_hidden*
PixelWars

4
Makefile
View File

@ -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)

2
orange/Makefile
View File

@ -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

17
orange/orange.c
View File

@ -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;