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

Fix gui/gui.png not being treated as gui.png, fixes #188.

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-06 15:32:43 +10:00
parent 4d8b0fc3d8
commit 7042dccd2f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ClassicalSharp/TexturePack/TexturePackExtractor.cs
View File

@ -37,11 +37,15 @@ namespace ClassicalSharp.TexturePack {
void ProcessZipEntry( string filename, byte[] data, ZipEntry entry ) { void ProcessZipEntry( string filename, byte[] data, ZipEntry entry ) {
MemoryStream stream = new MemoryStream( data ); MemoryStream stream = new MemoryStream( data );
ModelCache cache = game.ModelCache; ModelCache cache = game.ModelCache;
filename = filename.ToLower();
if( filename.StartsWith( "mob/" ) )
filename = filename.Substring( 4 );
switch( filename ) { // Ignore directories: convert x/name to name and x\name to name.
string name = filename.ToLower();
int i = name.LastIndexOf( '\\' );
if( i >= 0 ) name = name.Substring( i + 1, name.Length - 1 - i );
i = name.LastIndexOf( '/' );
if( i >= 0 ) name = name.Substring( i + 1, name.Length - 1 - i );
switch( name ) {
case "terrain.png": case "terrain.png":
Bitmap atlas = Platform.ReadBmp( stream ); Bitmap atlas = Platform.ReadBmp( stream );
if( !game.ChangeTerrainAtlas( atlas ) ) atlas.Dispose(); if( !game.ChangeTerrainAtlas( atlas ) ) atlas.Dispose();
@ -90,8 +94,8 @@ namespace ClassicalSharp.TexturePack {
SetFontBitmap( game, stream ); break; SetFontBitmap( game, stream ); break;
} }
if( !filename.EndsWith( ".png" ) ) return; if( !name.EndsWith( ".png" ) ) return;
string tex = filename.Substring( 0, filename.Length - 4 ); string tex = name.Substring( 0, name.Length - 4 );
game.Events.RaiseTextureChanged( tex ); game.Events.RaiseTextureChanged( tex );
} }