Merge branch 'master' into 'bro'

# Conflicts:
#   Elevator/Elevator.c
This commit is contained in:
Aethor committed 2018-06-22 00:00:32 +00:00
commit a8107a97b1
7 files changed
+37 -5

No files matched your search

+1
View File
@@ -23,6 +23,7 @@ void * runnable_Visitor(void * void_this){
printf("Visiteur %s : Je souhaite rendre visite a %s\n", this->name, this->contact_name);
printf("Visiteur %s : J'apelle à l'interphone\nVisiteur %s : J'apprends que %s habite à l'étage %d\n", this->name, this->name, this->contact_name, (this->destination = data->use_call_box(data, this->contact_name)));
data->main_building->go_to_floor(data->main_building, this->position, this->destination, passenger);
data->decrement_active_passengers(data);
return NULL;
}