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

Use bigger resolutions by default depending on current resolution.

Browse Source
This commit is contained in:
UnknownShadow200 2015-11-03 12:37:50 +11:00
parent 6389f8bf13
commit e8bed0c721
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ClassicalSharp/Game/Game.cs
View File

@ -381,8 +381,9 @@ namespace ClassicalSharp {
!(Inventory.CanPlace[block] && Inventory.CanDelete[block]))); !(Inventory.CanPlace[block] && Inventory.CanDelete[block])));
} }
public Game( string username, string mppass, string skinServer, string defaultTexPack, bool nullContext ) public Game( string username, string mppass, string skinServer, string defaultTexPack,
: base( 640, 480, GraphicsMode.Default, Program.AppName, nullContext, 0, DisplayDevice.Default ) { bool nullContext, int width, int height )
: base( width, height, GraphicsMode.Default, Program.AppName, nullContext, 0, DisplayDevice.Default ) {
Username = username; Username = username;
Mppass = mppass; Mppass = mppass;
this.skinServer = skinServer; this.skinServer = skinServer;

1
ClassicalSharp/Network/NetworkProcessor.cs
View File

@ -108,6 +108,7 @@ namespace ClassicalSharp {
while( reader.size > 0 ) { while( reader.size > 0 ) {
byte opcode = reader.buffer[0]; byte opcode = reader.buffer[0];
Console.WriteLine( (PacketId)opcode );
// Fix for older D3 servers which wrote one byte too many for HackControl packets. // Fix for older D3 servers which wrote one byte too many for HackControl packets.
if( opcode == 0xFF && lastOpcode == PacketId.CpeHackControl ) { if( opcode == 0xFF && lastOpcode == PacketId.CpeHackControl ) {
reader.Remove( 1 ); reader.Remove( 1 );

27
ClassicalSharp/Program.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using OpenTK;
namespace ClassicalSharp { namespace ClassicalSharp {
@ -21,22 +22,37 @@ namespace ClassicalSharp {
#if !USE_DX #if !USE_DX
nullContext = false; nullContext = false;
#endif #endif
int width, height;
SelectResolution( out width, out height );
if( args.Length == 0 || args.Length == 1 ) { if( args.Length == 0 || args.Length == 1 ) {
const string skinServer = "http://s3.amazonaws.com/MinecraftSkins/"; const string skinServer = "http://s3.amazonaws.com/MinecraftSkins/";
string pack = args.Length >= 1 ? args[0] : "default.zip"; string pack = args.Length >= 1 ? args[0] : "default.zip";
using( Game game = new Game( "LocalPlayer", null, skinServer, pack, nullContext ) ) {
using( Game game = new Game( "LocalPlayer", null, skinServer,
pack, nullContext, width, height ) )
game.Run(); game.Run();
}
} else if( args.Length < 4 ) { } else if( args.Length < 4 ) {
Utils.LogDebug( "ClassicalSharp.exe is only the raw client. You must either use the launcher or" Utils.LogDebug( "ClassicalSharp.exe is only the raw client. You must either use the launcher or"
+ " provide command line arguments to start the client." ); + " provide command line arguments to start the client." );
} else { } else {
RunMultiplayer( args, nullContext ); RunMultiplayer( args, nullContext, width, height );
} }
} }
static void RunMultiplayer( string[] args, bool nullContext ) { static void SelectResolution( out int width, out int height ) {
DisplayDevice device = DisplayDevice.Default;
width = 640; height = 480;
if( device.Width >= 1024 && device.Height >= 768 ) {
width = 800; height = 600;
}
if( device.Width >= 1920 && device.Height >= 1080 ) {
width = 1024; height = 768;
}
}
static void RunMultiplayer( string[] args, bool nullContext, int width, int height ) {
IPAddress ip = null; IPAddress ip = null;
if( !IPAddress.TryParse( args[2], out ip ) ) { if( !IPAddress.TryParse( args[2], out ip ) ) {
Utils.LogDebug( "Invalid IP \"" + args[2] + '"' ); Utils.LogDebug( "Invalid IP \"" + args[2] + '"' );
@ -52,7 +68,8 @@ namespace ClassicalSharp {
string skinServer = args.Length >= 5 ? args[4] : "http://s3.amazonaws.com/MinecraftSkins/"; string skinServer = args.Length >= 5 ? args[4] : "http://s3.amazonaws.com/MinecraftSkins/";
string pack = args.Length >= 6 ? args[5] : "default.zip"; string pack = args.Length >= 6 ? args[5] : "default.zip";
using( Game game = new Game( args[0], args[1], skinServer, pack, nullContext ) ) { using( Game game = new Game( args[0], args[1], skinServer, pack,
nullContext, width, height ) ) {
game.IPAddress = ip; game.IPAddress = ip;
game.Port = port; game.Port = port;
game.Run(); game.Run();