commit 493079d1

Poul Sander · 2021-10-20 21:03
493079d13c42b625785fefe46955291144d7f7e7 patch · browse files
parent 02fcbfc7d595ebe735e402be1ecfcf7c207f7456

Minor corrections

Changed files

M	CHANGELOG.md before
M	packdata.sh before
M	source/code/menudef.cpp before

diff --git a/CHANGELOG.md b/CHANGELOG.md index a16cdef..694f37a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md

@@ -13,6 +13,7 @@

- utfcpp is now an embedded library

- Dialog boxes now uses contructed textures thus reducing tearing on some renderers

- Garbage blocks now uses constructed textures thus reducing tearing on some renderers

+ - Screen shot feature now works with hardware render

### Removed

- Linux standalone build no longer includes 32 bit binary

diff --git a/packdata.sh b/packdata.sh index f71c41f..3645b1d 100755 --- a/packdata.sh +++ b/packdata.sh

@@ -2,7 +2,7 @@

set -e

zip -9jX Game/blockattack.data source/AUTH

pushd Game/data

-zip -9X $(find ../blockattack.data * | sort) -x \*svn*

+zip -9X $(find ../blockattack.data ./* | sort) -x \*svn*

popd

pushd Game/mods/1.3.0.bricks_unpacked.data/

zip -9X ../1.3.0.bricks.data $(find ./* | sort)

diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 9afb042..75d7e12 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp

@@ -135,7 +135,7 @@ class Button_confirmVolume : public Button {

std::string cvar="";

mutable std::string volumeLabel; /*used for cache*/

public:

- Button_confirmVolume(const char* cvar);

+ explicit Button_confirmVolume(const char* cvar);

virtual void doAction() override { /*Do nothing. Equal to choose "back". */ };

virtual const std::string& getLabel() const override;

};