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

+2 -1
View File
@@ -133,7 +133,8 @@ void *runnable_Elevator(void * void_this){
AGENT_OPTIONS
printf("Ascenseur %s : Initialisation...\n", this->name);
for (;;){
while (data->is_active_passengers_left(data)){
// for (;;){
usleep(250000);
if(this->target_floor == this->get_floor(this)){