Merge branch 'revert-6e536b36' into 'master'

Revert "debug, cleanup and gitignore" part 2

See merge request benjamin.sitbon/bandit_manchot!2

.gitignore

-*.o
-onearmedbandit

display.c

@@ -3,11 +3,10 @@
 #include <assert.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
 #include "utilities.h"
 #include "display.h"
-#include "wheel.h"
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_image.h>
 
 // the following global variables are defined for graphical objects only:
 // the images size is 104x128 pixels
@@ -69,7 +68,7 @@ void *display_func(void *param)
 
 
 
-int wheel_func(double index){ // rename?
+int wheel_func(double index){
 
 
 	// -------------------------

one_armed_bandit.c

@@ -4,24 +4,22 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <unistd.h>
-// #include <pthread.h>
+#include <pthread.h>
 #include <semaphore.h>
 #include "utilities.h"
 #include "display.h"
 #include "one_armed_bandit.h"
-// #include "wheel.h"
-#include "threads.h"
 
 int insert_coin(){
-  return -1;
+
 }
 
 int set_wheel_speed(int index){
-  return -1;
+
 }
 
 int next_wheel(){
-  return -1;
+
 }
 
 

one_armed_bandit.h

 #ifndef ONE_ARM_H
 #define ONE_ARM_H
 
-#include "wheel.h"
 
 #define OBJECT_NB 7
 #define WHEEL_NB 3

threads.h

@@ -3,9 +3,19 @@
 * Small library to ease the use of pthread
 */
 
-//TODO: MALLOOOOOOOCC
 
+/*
+                      ___               _
+                     / _ )___ _________(_)__ ____
+                    / _  / _ `/ __/ __/ / -_) __/
+                   /____/\_,_/_/ /_/ /_/\__/_/
 
+  |^|                 |^|                 |^|                 |^|
+  | |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |
+  | |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |
+  | |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |-| |
+
+*/
 #define __GNU_SOURCE
 
 // #include <stdio.h>

wheel.c

 int set_speed(int s){
-  return -1;
+
 }
 
 int get_current_px(){
-  return -1;
+
 }