Work around imagemagick regression that puts everything upside down

diff --git a/models/sprites/make-sprites.sh b/models/sprites/make-sprites.sh
index 27971f9a024fe4e86dafbfb97fb492c071c7b6b9..28223944d3ca887cbe7390f6e14c9560feb59512 100644 (file)
--- a/models/sprites/make-sprites.sh
+++ b/models/sprites/make-sprites.sh
@@ -130,7 +130,7 @@ sprite()
                shift
                shift
                pngsprite "${name}_frame$frame" "$color" "$bgcolor" "$text"
-               convert "${name}_frame$frame.png" "${name}_frame$frame.tga"
+               convert "${name}_frame$frame.png" -auto-orient "${name}_frame$frame.tga"
                rm -f "${name}_frame$frame.png"
                args="$args -sprite ${name}_frame$frame.tga $(($sprwidth / 2)) $(($sprheight - 1)) $interval"
                frame=$(($frame + 1))

diff --git a/models/weapons/make-sprites.sh b/models/weapons/make-sprites.sh
index 50f3fc672886a97cbc72553100005a31f96f63ae..3b8c437211993706720d03d9e4a718c393b4a9d8 100755 (executable)
--- a/models/weapons/make-sprites.sh
+++ b/models/weapons/make-sprites.sh
@@ -12,6 +12,7 @@ sprite()
 
        # Text
        exec {FD}< <(convert \
+       -auto-orient \
        -size 185x120 \
        -background transparent \
        -fill "#$color" \
@@ -38,6 +39,7 @@ sprite()
        yb2=$((yb1+15-1))
 
        exec {FD}< <(convert \
+       -auto-orient \
        -size 256x256 \
        -background transparent \
        -fill "#$color" \