diff --git a/Launcher2/Patcher/ResourcePatcher.cs b/Launcher2/Patcher/ResourcePatcher.cs index c1cc21d6f..eeaea8772 100644 --- a/Launcher2/Patcher/ResourcePatcher.cs +++ b/Launcher2/Patcher/ResourcePatcher.cs @@ -212,15 +212,16 @@ namespace Launcher.Patcher { const string animationsTxt = @"# This file defines the animations used in a texture pack for ClassicalSharp and other supporting applications. # Each line is in the format: -# - TileX and TileY indicate the coordinates of the tile in terrain.png that -# will be replaced by the animation frames. These range from 0 to 15. (inclusive of 15) -# - FrameX and FrameY indicates the pixel coordinates of the first animation frame in animations.png. -# - Frame Size indicates the size in pixels of an animation frame. -# - Frames count indicates the number of used frames. The first frame is located at +# - TileX and TileY are the coordinates of the tile in terrain.png that will be replaced by the animation frames. +# Essentially, TileX and TileY are the remainder and quotient of an ID in F10 menu divided by 16 +# For instance, obsidian texture (37) has TileX of 5, and TileY of 2 +# - FrameX and FrameY are the pixel coordinates of the first animation frame in animations.png. +# - Frame Size is the size in pixels of an animation frame. +# - Frames count is the number of used frames. The first frame is located at # (FrameX, FrameY), the second one at (FrameX + FrameSize, FrameY) and so on. -# - Tick delay is the number of ticks a frame doesn't change. For instance, a value of 0 -# means that the frame would be changed every tick, while a value of 2 would mean -# 'replace with frame 1, don't change frame, don't change frame, replace with frame 2'. +# - Tick delay is the number of ticks a frame doesn't change. For instance, delay of 0 +# means that the tile would be replaced every tick, while delay of 2 means +# 'replace with frame 1, don't change frame, don't change frame, replace with frame 2'. # NOTE: If a file called 'uselavaanim' is in the texture pack, ClassicalSharp 0.99.2 onwards uses its built-in dynamic generation for the lava texture animation. # NOTE: If a file called 'usewateranim' is in the texture pack, ClassicalSharp 0.99.5 onwards uses its built-in dynamic generation for the water texture animation. diff --git a/src/Client/World.h b/src/Client/World.h index 04adbd8fc..c79416ccb 100644 --- a/src/Client/World.h +++ b/src/Client/World.h @@ -48,7 +48,7 @@ Int32 WorldEnv_CloudsHeight; Real32 WorldEnv_CloudsSpeed; enum WEATHER { WEATHER_SUNNY, WEATHER_RAINY, WEATHER_SNOWY }; -extern const UInt8* Weather_Names[3]; +extern const UChar* Weather_Names[3]; Real32 WorldEnv_WeatherSpeed; Real32 WorldEnv_WeatherFade; Int32 WorldEnv_Weather;