diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e81d69e16..c6a9938a7 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -11,7 +11,7 @@ on: types: [published, created, edited] env: - VERSION: 1.4.0 + VERSION: 1.4.1 CTEST_EXT_COLOR_OUTPUT: TRUE CTEST_OUTPUT_ON_FAILURE: 1 CTEST_BUILD_FLAGS: -j4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 74a82eb70..f0a1fea41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(cdogs-sdl C) SET(VERSION_MAJOR "1") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") # Optionally configure CI files since they are excluded in source archives diff --git a/appveyor.yml b/appveyor.yml index a45c15359..5f0a3a6ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.4.0.{build} +version: 1.4.1.{build} branches: only: @@ -19,7 +19,7 @@ environment: SDL2_IMAGE_VERSION: 2.0.5 SDL2_MIXER_VERSION: 2.0.4 SDLDIR: C:\projects\cdogs-sdl - VERSION: 1.4.0 + VERSION: 1.4.1 install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" diff --git a/build/linux/io.github.cxong.cdogs-sdl.appdata.xml b/build/linux/io.github.cxong.cdogs-sdl.appdata.xml index 58b8407f9..40e78740f 100644 --- a/build/linux/io.github.cxong.cdogs-sdl.appdata.xml +++ b/build/linux/io.github.cxong.cdogs-sdl.appdata.xml @@ -29,6 +29,7 @@ https://i.imgur.com/30KUS8O.png + diff --git a/src/equip_menu.c b/src/equip_menu.c index 7d686268c..c1c4357bf 100644 --- a/src/equip_menu.c +++ b/src/equip_menu.c @@ -493,6 +493,7 @@ void EquipMenuCreate( } // Check how many util menu items there are menu->endSlot = MAX_WEAPONS; + menu->ammoSlot = -1; if (gCampaign.Setting.BuyAndSell) { if (gCampaign.Setting.Ammo)