diff --git a/.gitignore b/.gitignore index 89ed5cbf..00f783ec 100755 --- 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 index 7e103967..c8f86891 100644 --- 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 deleted file mode 100644 index 2d091494..00000000 --- a/install_manifest.txt +++ /dev/null @@ -1,177 +0,0 @@ -/usr/local/bin/opmon -/usr/local/share/applications/OPMon.desktop -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_5.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_4.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_7.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_12.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_2.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_8.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_1.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_3.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_9.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_2.gif -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_16.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_15.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_11.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_13.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_14.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_6.png -/usr/local/share/OpMon/animations/chimneysmoke/chimneysmoke_10.png -/usr/local/share/OpMon/animations/chimneysmoke/ind.ex -/usr/local/share/OpMon/animations/basicdoor/basic_door2.png -/usr/local/share/OpMon/animations/basicdoor/basic_door1.png -/usr/local/share/OpMon/animations/basicdoor/basic_door4.png -/usr/local/share/OpMon/animations/basicdoor/basic_door3.png -/usr/local/share/OpMon/animations/windturbine/blade_6.png -/usr/local/share/OpMon/animations/windturbine/blade_5.png -/usr/local/share/OpMon/animations/windturbine/blade_16.png -/usr/local/share/OpMon/animations/windturbine/blade_1.png -/usr/local/share/OpMon/animations/windturbine/blade_14.png -/usr/local/share/OpMon/animations/windturbine/blade_3.png -/usr/local/share/OpMon/animations/windturbine/blade_13.png -/usr/local/share/OpMon/animations/windturbine/blade_10.png -/usr/local/share/OpMon/animations/windturbine/blade_2.png -/usr/local/share/OpMon/animations/windturbine/blade_9.png -/usr/local/share/OpMon/animations/windturbine/blade_4.png -/usr/local/share/OpMon/animations/windturbine/blade_7.png -/usr/local/share/OpMon/animations/windturbine/blade_11.png -/usr/local/share/OpMon/animations/windturbine/blade_15.png -/usr/local/share/OpMon/animations/windturbine/blade_12.png -/usr/local/share/OpMon/animations/windturbine/blade_8.png -/usr/local/share/OpMon/animations/shopdoor/shop_door2.png -/usr/local/share/OpMon/animations/shopdoor/shop_door4.png -/usr/local/share/OpMon/animations/shopdoor/shop_door1.png -/usr/local/share/OpMon/animations/shopdoor/shop_door3.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame4.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame3.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame1.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame6.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame5.png -/usr/local/share/OpMon/animations/winChange/animWindowFrame2.png -/usr/local/share/OpMon/tileset/tileset.png -/usr/local/share/OpMon/sprites/misc/yes.png -/usr/local/share/OpMon/sprites/misc/selectBar.png -/usr/local/share/OpMon/sprites/misc/arrChoice.png -/usr/local/share/OpMon/sprites/misc/arrDial.png -/usr/local/share/OpMon/sprites/battle/health_jauge.png -/usr/local/share/OpMon/sprites/battle/health_bar.png -/usr/local/share/OpMon/sprites/battle/square_1.png -/usr/local/share/OpMon/sprites/chara/pp/mpp3.png -/usr/local/share/OpMon/sprites/chara/pp/pp3.png -/usr/local/share/OpMon/sprites/chara/pp/mpp20.png -/usr/local/share/OpMon/sprites/chara/pp/mpp1.png -/usr/local/share/OpMon/sprites/chara/pp/mpp0.png -/usr/local/share/OpMon/sprites/chara/pp/pp0.png -/usr/local/share/OpMon/sprites/chara/pp/mpp23.png -/usr/local/share/OpMon/sprites/chara/pp/mpp22.png -/usr/local/share/OpMon/sprites/chara/pp/mpp21.png -/usr/local/share/OpMon/sprites/chara/pp/pp1.png -/usr/local/share/OpMon/sprites/chara/pp/pp_fight.png -/usr/local/share/OpMon/sprites/chara/pp/mpp2.png -/usr/local/share/OpMon/sprites/chara/pp/pp2.png -/usr/local/share/OpMon/sprites/chara/beta/beta2.png -/usr/local/share/OpMon/sprites/chara/beta/beta8.png -/usr/local/share/OpMon/sprites/chara/beta/beta3.png -/usr/local/share/OpMon/sprites/chara/beta/beta4.png -/usr/local/share/OpMon/sprites/chara/beta/beta11.png -/usr/local/share/OpMon/sprites/chara/beta/beta7.png -/usr/local/share/OpMon/sprites/chara/beta/beta5.png -/usr/local/share/OpMon/sprites/chara/beta/beta0.png -/usr/local/share/OpMon/sprites/chara/beta/beta1.png -/usr/local/share/OpMon/sprites/chara/beta/beta6.png -/usr/local/share/OpMon/sprites/chara/beta/beta10.png -/usr/local/share/OpMon/sprites/chara/beta/beta9.png -/usr/local/share/OpMon/sprites/chara/jlppc/jlppc.png -/usr/local/share/OpMon/sprites/chara/jlppc/profkiwai.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer22.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer1.png -/usr/local/share/OpMon/sprites/chara/farmer/farmer0.png -/usr/local/share/OpMon/sprites/chara/farmer/farmer3.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer20.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer23.png -/usr/local/share/OpMon/sprites/chara/farmer/farmer1.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer3.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer2.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer21.png -/usr/local/share/OpMon/sprites/chara/farmer/mfarmer0.png -/usr/local/share/OpMon/sprites/chara/farmer/farmer2.png -/usr/local/share/OpMon/sprites/chara/kid/kid6.png -/usr/local/share/OpMon/sprites/chara/kid/kid1.png -/usr/local/share/OpMon/sprites/chara/kid/kid7.png -/usr/local/share/OpMon/sprites/chara/kid/kid10.png -/usr/local/share/OpMon/sprites/chara/kid/kid9.png -/usr/local/share/OpMon/sprites/chara/kid/kid3.png -/usr/local/share/OpMon/sprites/chara/kid/kid5.png -/usr/local/share/OpMon/sprites/chara/kid/kid11.png -/usr/local/share/OpMon/sprites/chara/kid/kid2.png -/usr/local/share/OpMon/sprites/chara/kid/kid0.png -/usr/local/share/OpMon/sprites/chara/kid/kid4.png -/usr/local/share/OpMon/sprites/chara/kid/kid8.png -/usr/local/share/OpMon/sprites/chara/prof/prof4.png -/usr/local/share/OpMon/sprites/chara/prof/prof11.png -/usr/local/share/OpMon/sprites/chara/prof/prof0.png -/usr/local/share/OpMon/sprites/chara/prof/prof10.png -/usr/local/share/OpMon/sprites/chara/prof/prof2.png -/usr/local/share/OpMon/sprites/chara/prof/prof3.png -/usr/local/share/OpMon/sprites/chara/prof/prof9.png -/usr/local/share/OpMon/sprites/chara/prof/prof7.png -/usr/local/share/OpMon/sprites/chara/prof/prof1.png -/usr/local/share/OpMon/sprites/chara/prof/prof8.png -/usr/local/share/OpMon/sprites/chara/prof/prof5.png -/usr/local/share/OpMon/sprites/chara/prof/prof6.png -/usr/local/share/OpMon/sprites/chara/rival/sk6.png -/usr/local/share/OpMon/sprites/chara/rival/sk4.png -/usr/local/share/OpMon/sprites/chara/rival/sk1.png -/usr/local/share/OpMon/sprites/chara/rival/sk2.png -/usr/local/share/OpMon/sprites/chara/rival/sk7.png -/usr/local/share/OpMon/sprites/chara/rival/sk9.png -/usr/local/share/OpMon/sprites/chara/rival/sk10.png -/usr/local/share/OpMon/sprites/chara/rival/sk5.png -/usr/local/share/OpMon/sprites/chara/rival/sk3.png -/usr/local/share/OpMon/sprites/chara/rival/sk0.png -/usr/local/share/OpMon/sprites/chara/rival/sk8.png -/usr/local/share/OpMon/sprites/chara/rival/sk11.png -/usr/local/share/OpMon/sprites/chara/mom/mom8.png -/usr/local/share/OpMon/sprites/chara/mom/mom4.png -/usr/local/share/OpMon/sprites/chara/mom/mom3.png -/usr/local/share/OpMon/sprites/chara/mom/mom0.png -/usr/local/share/OpMon/sprites/chara/mom/mom6.png -/usr/local/share/OpMon/sprites/chara/mom/mom9.png -/usr/local/share/OpMon/sprites/chara/mom/mom10.png -/usr/local/share/OpMon/sprites/chara/mom/mom2.png -/usr/local/share/OpMon/sprites/chara/mom/mom11.png -/usr/local/share/OpMon/sprites/chara/mom/mom1.png -/usr/local/share/OpMon/sprites/chara/mom/mom7.png -/usr/local/share/OpMon/sprites/chara/mom/mom5.png -/usr/local/share/OpMon/README -/usr/local/share/OpMon/keys/english.rkeys -/usr/local/share/OpMon/keys/francais.rkeys -/usr/local/share/OpMon/keys/espanol.rkeys -/usr/local/share/OpMon/OPMon.desktop -/usr/local/share/OpMon/fonts/Default-LICENSE.txt -/usr/local/share/OpMon/fonts/Default.ttf -/usr/local/share/OpMon/opmon.png -/usr/local/share/OpMon/audio/music/title.ogg -/usr/local/share/OpMon/audio/music/mysterioucity.ogg -/usr/local/share/OpMon/audio/music/route14.ogg -/usr/local/share/OpMon/audio/music/error.ogg -/usr/local/share/OpMon/audio/music/intro.ogg -/usr/local/share/OpMon/audio/music/faubourgeuvi.ogg -/usr/local/share/OpMon/audio/sounds/dialogChange.ogg -/usr/local/share/OpMon/audio/sounds/selectbuttons.ogg -/usr/local/share/OpMon/audio/sounds/door.ogg -/usr/local/share/OpMon/audio/sounds/nope.ogg -/usr/local/share/OpMon/audio/sounds/shopdoor.ogg -/usr/local/share/OpMon/audio/sounds/select.ogg -/usr/local/share/OpMon/backgrounds/options+.png -/usr/local/share/OpMon/backgrounds/dialog/dialog.png -/usr/local/share/OpMon/backgrounds/dialog/dialogChoose.png -/usr/local/share/OpMon/backgrounds/titlescreen.png -/usr/local/share/OpMon/backgrounds/options.png -/usr/local/share/OpMon/backgrounds/credits.png -/usr/local/share/OpMon/backgrounds/start/nameEntry.png -/usr/local/share/OpMon/backgrounds/start/startscene.png -/usr/local/share/OpMon/backgrounds/lang.png -/usr/local/share/OpMon/backgrounds/loading.png -/usr/local/share/OpMon/backgrounds/menu.png -/usr/local/share/OpMon/backgrounds/battle_bkg/background_grass.png \ No newline at end of file diff --git a/src/opmon/start/Gameloop.cpp b/src/opmon/start/Gameloop.cpp index 3410a713..cc95879a 100644 --- 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 index 3d92cbfe..8d117c6f 100644 --- 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));