AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify text in default animations.txt

Browse Source
This commit is contained in:
UnknownShadow200 2019-05-23 16:22:24 +10:00
parent 6ceebd8345
commit f0b5e810fb
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Formats.c
View File

@ -850,7 +850,7 @@ static ReturnCode Dat_ReadFieldData(struct Stream* stream, struct JFieldDesc* fi
case JFIELD_OBJECT: {
/* Luckily for us, we only have to account for blockMap object */
/* Other objects (e.g. player) are stored after the fields we actually care about, so ignore them */
fieldName = String_FromRawArray(field->FieldName);
fieldName = String_FromRaw((char*)field->FieldName, JNAME_SIZE);
if (!String_CaselessEqualsConst(&fieldName, "blockMap")) return 0;
if ((res = stream->ReadU8(stream, &typeCode))) return res;
@ -920,7 +920,7 @@ ReturnCode Dat_Load(struct Stream* stream) {
for (i = 0; i < obj.FieldsCount; i++) {
field = &obj.Fields[i];
if ((res = Dat_ReadFieldData(&compStream, field))) return res;
fieldName = String_FromRawArray(field->FieldName);
fieldName = String_FromRaw((char*)field->FieldName, JNAME_SIZE);
if (String_CaselessEqualsConst(&fieldName, "width")) {
World.Width = Dat_I32(field);

4
src/Graphics.c
View File

@ -886,7 +886,7 @@ ReturnCode Gfx_TakeScreenshot(struct Stream* output) {
res = IDirect3DSurface9_LockRect(temp, &rect, NULL, D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE);
if (res) goto finished;
{
Bitmap_Init(bmp, desc.Width, desc.Height, rect.pBits);
Bitmap_Init(bmp, desc.Width, desc.Height, (uint8_t*)rect.pBits);
res = Png_Encode(&bmp, output, NULL, false);
if (res) { IDirect3DSurface9_UnlockRect(temp); goto finished; }
}
@ -1090,7 +1090,7 @@ static void Gfx_DoMipmaps(int x, int y, Bitmap* bmp, bool partial) {
if (width > 1) width /= 2;
if (height > 1) height /= 2;
cur = Mem_Alloc(width * height, 4, "mipmaps");
cur = (uint8_t*)Mem_Alloc(width * height, 4, "mipmaps");
Gfx_GenMipmaps(width, height, cur, prev);
if (partial) {

3
src/MapRenderer.c
View File

@ -321,7 +321,8 @@ static void MapRenderer_FreeChunks(void) {
static void MapRenderer_AllocateParts(void) {
uint32_t count = MapRenderer_ChunksCount * MapRenderer_1DUsedCount;
partsBuffer_Raw = Mem_AllocCleared(count * 2, sizeof(struct ChunkPartInfo), "chunk parts");
partsBuffer_Raw = (struct ChunkPartInfo*)Mem_AllocCleared(count * 2, sizeof(struct ChunkPartInfo), "chunk parts");
MapRenderer_PartsNormal = partsBuffer_Raw;
MapRenderer_PartsTranslucent = partsBuffer_Raw + count;
}

2
src/PacketHandlers.c
View File

@ -470,7 +470,7 @@ static void Classic_LevelDataChunk(uint8_t* data) {
#else
if (cpe_extBlocks && value) {
/* Only allocate map2 when needed */
if (!map2_blocks) map2_blocks = Mem_Alloc(map_volume, 1, "map blocks upper");
if (!map2_blocks) map2_blocks = (BlockRaw*)Mem_Alloc(map_volume, 1, "map blocks upper");
left = map_volume - map2_index;
map2_stream.Read(&map2_stream, &map2_blocks[map2_index], left, &read);

6
src/Resources.c
View File

@ -324,7 +324,7 @@ static ReturnCode ZipPatcher_WritePng(struct Stream* s, struct ResourceTexture*
*-------------------------------------------------------Texture patcher---------------------------------------------------*
*#########################################################################################################################*/
#define ANIMS_TXT_CONTENTS \
"# This file defines the animations used in a texture pack for ClassicalSharp and other supporting applications.\r\n" \
"# This file defines the animations used in a texture pack for ClassiCube.\r\n" \
"# Each line is in the format : <TileX> <TileY> <FrameX> <FrameY> <Frame size> <Frames count> <Tick delay>\r\n" \
"# - TileX and TileY are the coordinates of the tile in terrain.png that will be replaced by the animation frames.\r\n" \
"# Essentially, TileX and TileY are the remainder and quotient of an ID in F10 menu divided by 16\r\n" \
@ -336,8 +336,8 @@ static ReturnCode ZipPatcher_WritePng(struct Stream* s, struct ResourceTexture*
"# - Tick delay is the number of ticks a frame doesn't change. For instance, delay of 0\r\n" \
"# means that the tile would be replaced every tick, while delay of 2 means\r\n" \
"# 'replace with frame 1, don't change frame, don't change frame, replace with frame 2'.\r\n" \
"# 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.\r\n" \
"# 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.\r\n" \
"# NOTE: If a file called 'uselavaanim' is in the texture pack, the game instead generates the lava texture animation.\r\n" \
"# NOTE: If a file called 'usewateranim' is in the texture pack, the game instead generates the water texture animation.\r\n" \
"\r\n" \
"# fire\r\n" \
"6 2 0 0 16 32 0"