merge fix

src/controlpanel.c

@@ -111,7 +111,7 @@ void Panel_drawWin(Panel * self, Player * player){
 
 void Panel_drawGame(Panel * self)
 {
-    //BeginDrawing();
+    BeginDrawing();
     ClearBackground(RAYWHITE);
     
     // Draw the edges for each nodes:
@@ -127,8 +127,8 @@ void Panel_drawGame(Panel * self)
     {
         Panel_drawNode( self, &(self->world->nodes[i]) );
     }
-    //Panel_drawBasis(self);
-    //EndDrawing(); 
+    Panel_drawBasis(self);
+    EndDrawing(); 
 }
 
 void Panel_drawBasis(Panel * self)

src/main-viewer.c

@@ -52,6 +52,9 @@ int main(int nbArg, char ** arg)
     // Main game loop
 
     //UI elements
+    Panel * panel = Panel_new();
+    Panel_initialize(panel, world, screenWidth, screenHeight);
+    
     Main_Menu * menu = Main_Menu_init(screenWidth, screenHeight);
     Main_Menu * rulesMenu = Rules_Menu_init(screenWidth, screenHeight);
     Options_Menu * optionsMenu = Options_Menu_init(&playerCount, &nodeCount, screenWidth, screenHeight);

src/mission.c

@@ -34,7 +34,6 @@ Mission * Mission_init(const int playerID, NetWorld * world){
             self->displayText = displayText;
             break;
     }
-
     return self;
 }
 

src/player.c

@@ -38,7 +38,6 @@ void Players_delete(Player * player, int size)
     for(int i = 0 ; i < size ; i++){
         free((player+i)->nodes);
         free((player+i)->selectedNode);
-        free((player+i));
     }
     free(player);
 }