Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable window titles and isons again, windows build fixes

Browse Source
This commit is contained in:
Petr Mrázek 2014-05-11 16:43:20 +02:00
parent ad1f2c530c
commit e993adaf44
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
depends/launcher/org/multimc/onesix/OneSixLauncher.java
View File

@ -218,6 +218,7 @@ public class OneSixLauncher implements Launcher
e.printStackTrace(System.err); e.printStackTrace(System.err);
return -1; return -1;
} }
/*
final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png"); final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png");
new Thread() { new Thread() {
public void run() { public void run() {
@ -263,7 +264,7 @@ public class OneSixLauncher implements Launcher
} }
} }
.start(); .start();
*/
// init params for the main method to chomp on. // init params for the main method to chomp on.
String[] paramsArray = mcparams.toArray(new String[mcparams.size()]); String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
try try

1
logic/MMCJson.cpp
View File

@ -1,5 +1,6 @@
#include "MMCJson.h" #include "MMCJson.h"
#include <QString> #include <QString>
#include <QStringList>
#include <math.h> #include <math.h>
bool MMCJson::ensureBoolean(const QJsonValue val, const QString what) bool MMCJson::ensureBoolean(const QJsonValue val, const QString what)

6
logic/OneSixUpdate.cpp
View File

@ -298,8 +298,8 @@ void OneSixUpdate::jarlibFinished()
QString fullJarPath = entry->getFullPath(); QString fullJarPath = entry->getFullPath();
QString fullStrippedJarPath = entryStripped->getFullPath(); QString fullStrippedJarPath = entryStripped->getFullPath();
QFileInfo finfo(fullStrippedJarPath);
if (entry->md5sum != jarHashOnEntry || !QFileInfo::exists(fullStrippedJarPath)) if (entry->md5sum != jarHashOnEntry || !finfo.exists())
{ {
stripJar(fullJarPath, fullStrippedJarPath); stripJar(fullJarPath, fullStrippedJarPath);
} }
@ -500,4 +500,4 @@ void OneSixUpdate::fmllibsFailed()
{ {
emitFailed("Game update failed: it was impossible to fetch the required FML libraries."); emitFailed("Game update failed: it was impossible to fetch the required FML libraries.");
return; return;
} }

2
logic/minecraft/VersionFinal.cpp
View File

@ -68,7 +68,7 @@ bool VersionFinal::preremove(VersionPatchPtr patch)
{ {
QString fullpath =PathCombine(m_instance->jarModsDir(), jarmod->name); QString fullpath =PathCombine(m_instance->jarModsDir(), jarmod->name);
QFileInfo finfo (fullpath); QFileInfo finfo (fullpath);
if(finfo.exists(fullpath)) if(finfo.exists())
ok &= QFile::remove(fullpath); ok &= QFile::remove(fullpath);
} }
return ok; return ok;