Skip to content

Two misc fixes#41586

Merged
ZhilkinSerg merged 2 commits intoCleverRaven:masterfrom
Qrox:misc-fixes
Jun 26, 2020
Merged

Two misc fixes#41586
ZhilkinSerg merged 2 commits intoCleverRaven:masterfrom
Qrox:misc-fixes

Conversation

@Qrox
Copy link
Copy Markdown
Contributor

@Qrox Qrox commented Jun 25, 2020

Summary

SUMMARY: None

Purpose of change

  1. Remove a debug message about pseudo furniture item not having magazine pocket. Furnitures such as boulders have pseudo items that do not have magazine pocket but can be used as tools.
  2. Fix CMake not correctly generating game version string.

Describe the solution

  1. Remove the debug message
  2. Add the correct command flags to CMakeList.txt

Testing

  1. Tested by moving near a boulder, set all skills to 10 to unlock recipes, and open the crafting menu. Before this change a debug message would be shown and after this change the debug message no longer shows.
  2. Tested by compiling the game.

Qrox added 2 commits June 26, 2020 00:32
It's possible for valid pseudo items to not have magazine pocket type, for example boulder anvils.
@ZhilkinSerg ZhilkinSerg merged commit de1a6cc into CleverRaven:master Jun 26, 2020
@anothersimulacrum anothersimulacrum added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments labels Jun 26, 2020
@Qrox Qrox deleted the misc-fixes branch June 27, 2020 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants