merge fix

.gitignore

@@ -10,3 +10,4 @@ doc/html
 nw-*
 config
 *.o
+risk
\ No newline at end of file

CMakeLists.txt

@@ -18,7 +18,7 @@ include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src)
 include_directories( ${PROJECT_SOURCE_DIR}/dpd/include )
 link_directories( ${PROJECT_SOURCE_DIR}/dpd )
 
-add_executable(nw-viewer src/main-viewer.c src/networld.c src/controlpanel.c src/entity.c src/player.c src/random-map.c src/graphical-aspect.c src/window-manager.c src/menu-button.c src/main-menu.c src/int-input.c src/options-menu.c)
+add_executable(risk src/main-viewer.c src/networld.c src/controlpanel.c src/entity.c src/player.c src/random-map.c src/graphical-aspect.c src/window-manager.c src/menu-button.c src/main-menu.c src/int-input.c src/options-menu.c)
 
 target_link_libraries(risk raylib pthread dl rt X11 m)
 

bin/build.sh

@@ -9,4 +9,4 @@ cmake ..
 make
 
 # Outputs
-cp nw-viewer ..
+cp risk ..

src/controlpanel.c

@@ -101,7 +101,7 @@ void Panel_drawGame(Panel * self)
         Panel_drawNode( self, &(self->world->nodes[i]) );
     }
     //Panel_drawBasis(self);
-    //EndDrawing(); 
+    EndDrawing(); 
 }
 
 void Panel_drawBasis(Panel * self)

src/main-viewer.c

@@ -62,7 +62,6 @@ int main(int nbArg, char ** arg)
     {
         DrawFPS(10, 10);
         Window_Manager_display(manager);
-
         switch (manager->display)
         {
         case main_menu: