Skip to content

Commit

Permalink
Version 1.4.1, fix ammo menu showing
Browse files Browse the repository at this point in the history
  • Loading branch information
cxong committed Feb 11, 2023
1 parent c1e88cd commit 48f6933
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.4.0.{build}
version: 1.4.1.{build}

branches:
only:
Expand All @@ -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%"
Expand Down
1 change: 1 addition & 0 deletions build/linux/io.github.cxong.cdogs-sdl.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<screenshot>https://i.imgur.com/30KUS8O.png</screenshot>
</screenshots>
<releases>
<release version="1.4.1" date="2023-02-12"/>
<release version="1.4.0" date="2022-11-13"/>
<release version="1.3.1" date="2022-06-13"/>
<release version="1.3.0" date="2022-05-01"/>
Expand Down
1 change: 1 addition & 0 deletions src/equip_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 48f6933

Please sign in to comment.