AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 19:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

C client should't reject inf tex terrain.png

Browse Source
This commit is contained in:
UnknownShadow200 2018-07-31 21:57:40 +10:00
parent 915781c7ca
commit 91e707f03b
7 changed files with 129 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClassicalSharp/Game/Game.cs
View File

@ -43,9 +43,9 @@ namespace ClassicalSharp {
public bool ChangeTerrainAtlas(Bitmap atlas) { public bool ChangeTerrainAtlas(Bitmap atlas) {
if (!ValidateBitmap("terrain.png", atlas)) return false; if (!ValidateBitmap("terrain.png", atlas)) return false;
if (atlas.Width != atlas.Height && (atlas.Width * 2 != atlas.Height)) { if (atlas.Height < atlas.Width) {
Chat.Add("&cUnable to use terrain.png from the texture pack."); Chat.Add("&cUnable to use terrain.png from the texture pack.");
Chat.Add("&c Its width is not the same as its height."); Chat.Add("&c Its height is less than its width.");
return false; return false;
} }
if (Graphics.LostContext) return false; if (Graphics.LostContext) return false;

4
ClassicalSharp/Network/Protocols/CPE.cs
View File

@ -421,9 +421,7 @@ namespace ClassicalSharp.Network.Protocols {
BlockID order = reader.ReadBlock(); BlockID order = reader.ReadBlock();
game.Inventory.Remove(block); game.Inventory.Remove(block);
// TODO: kinda hacky, get rid of 255 completely when servers updated if (order != 0) { game.Inventory.Map[order - 1] = block; }
bool hidden = order == 0 || (order == 255 && !net.cpeData.extTexs);
if (!hidden) { game.Inventory.Map[order - 1] = block; }
} }
#endregion #endregion

2
ClassicalSharp/Particles/ParticleManager.cs
View File

@ -40,7 +40,7 @@ namespace ClassicalSharp.Particles {
void TextureChanged(object sender, TextureEventArgs e) { void TextureChanged(object sender, TextureEventArgs e) {
if (e.Name == "particles.png") if (e.Name == "particles.png")
game.Loadtexture(ref ParticlesTexId, e.Name, e.Data); game.LoadTexture(ref ParticlesTexId, e.Name, e.Data);
} }

1
ClassicalSharp/TexturePack/TerrainAtlas.cs
View File

@ -19,6 +19,7 @@ namespace ClassicalSharp.Textures {
Atlas = bmp; Atlas = bmp;
TileSize = bmp.Width / TilesPerRow; TileSize = bmp.Width / TilesPerRow;
RowsCount = bmp.Height / TileSize; RowsCount = bmp.Height / TileSize;
RowsCount = Math.Min(RowsCount, MaxRowsCount);
BlockInfo.RecalculateSpriteBB(); BlockInfo.RecalculateSpriteBB();
} }

4
src/Client/Game.c
View File

@ -139,9 +139,9 @@ bool Game_ChangeTerrainAtlas(struct Bitmap* atlas) {
String terrain = String_FromConst("terrain.png"); String terrain = String_FromConst("terrain.png");
if (!Game_ValidateBitmap(&terrain, atlas)) return false; if (!Game_ValidateBitmap(&terrain, atlas)) return false;
if (atlas->Width != atlas->Height) { if (atlas->Height < atlas->Width) {
String m1 = String_FromConst("&cUnable to use terrain.png from the texture pack."); Chat_Add(&m1); String m1 = String_FromConst("&cUnable to use terrain.png from the texture pack."); Chat_Add(&m1);
String m2 = String_FromConst("&c Its width is not the same as its height."); Chat_Add(&m2); String m2 = String_FromConst("&c Its height is less than its width."); Chat_Add(&m2);
return false; return false;
} }
if (Gfx_LostContext) return false; if (Gfx_LostContext) return false;

6
src/Client/Menus.c
View File

@ -2941,12 +2941,12 @@ static void TexIdsOverlay_ContextRecreated(void* obj) {
String prefix = String_FromConst("f"); String prefix = String_FromConst("f");
TextAtlas_Make(&screen->IdAtlas, &chars, &screen->TextFont, &prefix); TextAtlas_Make(&screen->IdAtlas, &chars, &screen->TextFont, &prefix);
Int32 size = Game_Height / ATLAS2D_ROWS_COUNT; Int32 size = Game_Height / ATLAS2D_TILES_PER_ROW;
size = (size / 8) * 8; size = (size / 8) * 8;
Math_Clamp(size, 8, 40); Math_Clamp(size, 8, 40);
screen->XOffset = Gui_CalcPos(ANCHOR_CENTRE, 0, size * ATLAS2D_TILES_PER_ROW, Game_Width); screen->XOffset = Gui_CalcPos(ANCHOR_CENTRE, 0, size * ATLAS2D_ROWS_COUNT, Game_Width);
screen->YOffset = Gui_CalcPos(ANCHOR_CENTRE, 0, size * ATLAS2D_ROWS_COUNT, Game_Height); screen->YOffset = Gui_CalcPos(ANCHOR_CENTRE, 0, size * ATLAS2D_TILES_PER_ROW, Game_Height);
screen->TileSize = size; screen->TileSize = size;
String title = String_FromConst("Texture ID reference sheet"); String title = String_FromConst("Texture ID reference sheet");

4
src/Client/PacketHandlers.c
View File

@ -1145,9 +1145,7 @@ static void CPE_SetInventoryOrder(struct Stream* stream) {
BlockID order = Handlers_ReadBlock(stream); BlockID order = Handlers_ReadBlock(stream);
Inventory_Remove(block); Inventory_Remove(block);
if (order != 255 && order != 0) { if (order) { Inventory_Map[order - 1] = block; }
Inventory_Map[order - 1] = block;
}
} }
static void CPE_Reset(void) { static void CPE_Reset(void) {