Fixed some problems with deb

OpMonTeam · Feb 21, 2018 · c72233e · c72233e
1 parent 3e23a61
commit c72233e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,5 +51,9 @@ CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 cmake_install.cmake
+*.deb
+*.tar.gz
+install_manifest.txt
 *#
+.#*
 config.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(OPMON_HOMEPAGE "http://http://opmon-game.ga/")
 # libsfml is splited in many packages on debian:
 # libsfml-xxx2 (until 2.4), then libsfml-xxx2.4
 foreach(ARG system audio window graphics)
-    list(APPEND OPMON_DEBIAN_DEPENDS "libsfml-${ARG}2 (>= 2.3.2+dfsg-1)|libsfml-${ARG}2.4")
+    list(APPEND OPMON_DEBIAN_DEPENDS "libsfml-${ARG}2 (>= 2.3.2+dfsg-1) | libsfml-${ARG}2.4 | libsfml-dev (>= 2.3.2+dfsg-1)")
 endforeach()
 string(REPLACE ";" ", " OPMON_DEBIAN_DEPENDS "${OPMON_DEBIAN_DEPENDS}")
 
@@ -110,7 +110,7 @@ if (UNIX)
 
     # TODO: put resource files in the correct folder
     # Note: trailing slash "bin/" is important.
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION share/OpMon)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION local/share/OpMon)
 else()
     install(TARGETS ${EXECUTABLE_NAME} DESTINATION .)
     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION .)

diff --git a/install_manifest.txt b/install_manifest.txt
diff --git a/src/opmon/start/Gameloop.cpp b/src/opmon/start/Gameloop.cpp
@@ -31,7 +31,6 @@ namespace OpMon {
         _gameScreens.push(first_ctrl);
 
         GameStatus status = GameStatus::CONTINUE;
-        Model::Data::player.getPosition().setPosition(1, 4);
         while(status != GameStatus::STOP) {
             status = GameStatus::CONTINUE;
 

diff --git a/src/opmon/view/Overworld.cpp b/src/opmon/view/Overworld.cpp
@@ -98,8 +98,8 @@ namespace OpMon {
         Overworld::Overworld(const std::string &mapId) {
             current = Model::Data::World::maps[mapId];
             character.setTexture(Model::Data::Ui::texturePP[(int)Side::TO_DOWN]);
-            Model::Data::player.tp(mapId, sf::Vector2i(2, 2));
-            character.setPosition(2 SQUARES - 16, 2 SQUARES);
+            Model::Data::player.tp(mapId, sf::Vector2i(2, 4));
+            character.setPosition(2 SQUARES - 16, 4 SQUARES);
             camera.setCenter(this->getCharacter().getPosition());
             camera.setSize(sf::Vector2f(16 SQUARES, 16 SQUARES));