mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-08 18:46:36 +00:00
chore: format Minecraft.Client
This commit is contained in:
@@ -6,41 +6,37 @@
|
||||
|
||||
CRITICAL_SECTION ProgressRenderer::s_progress;
|
||||
|
||||
ProgressRenderer::ProgressRenderer(Minecraft *minecraft)
|
||||
{
|
||||
status = -1;
|
||||
title = -1;
|
||||
lastTime = System::currentTimeMillis();
|
||||
noAbort = false;
|
||||
this->minecraft = minecraft;
|
||||
this->m_eType=eProgressStringType_ID;
|
||||
ProgressRenderer::ProgressRenderer(Minecraft* minecraft) {
|
||||
status = -1;
|
||||
title = -1;
|
||||
lastTime = System::currentTimeMillis();
|
||||
noAbort = false;
|
||||
this->minecraft = minecraft;
|
||||
this->m_eType = eProgressStringType_ID;
|
||||
}
|
||||
|
||||
void ProgressRenderer::progressStart(int title)
|
||||
{
|
||||
noAbort = false;
|
||||
_progressStart(title);
|
||||
void ProgressRenderer::progressStart(int title) {
|
||||
noAbort = false;
|
||||
_progressStart(title);
|
||||
}
|
||||
|
||||
void ProgressRenderer::progressStartNoAbort(int string)
|
||||
{
|
||||
noAbort = true;
|
||||
void ProgressRenderer::progressStartNoAbort(int string) {
|
||||
noAbort = true;
|
||||
_progressStart(string);
|
||||
}
|
||||
|
||||
void ProgressRenderer::_progressStart(int title)
|
||||
{
|
||||
// 4J Stu - Removing all progressRenderer rendering. This will be replaced on the xbox
|
||||
if (!minecraft->running)
|
||||
{
|
||||
void ProgressRenderer::_progressStart(int title) {
|
||||
// 4J Stu - Removing all progressRenderer rendering. This will be replaced
|
||||
// on the xbox
|
||||
if (!minecraft->running) {
|
||||
if (noAbort) return;
|
||||
// throw new StopGameException(); // 4J - removed
|
||||
// throw new StopGameException(); // 4J - removed
|
||||
}
|
||||
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
lastPercent = 0;
|
||||
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
lastPercent = 0;
|
||||
this->title = title;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
|
||||
#if 0
|
||||
ScreenSizeCalculator ssc(minecraft->options, minecraft->width, minecraft->height);
|
||||
@@ -55,30 +51,27 @@ void ProgressRenderer::_progressStart(int title)
|
||||
#endif
|
||||
}
|
||||
|
||||
void ProgressRenderer::progressStage(int status)
|
||||
{
|
||||
if (!minecraft->running)
|
||||
{
|
||||
void ProgressRenderer::progressStage(int status) {
|
||||
if (!minecraft->running) {
|
||||
if (noAbort) return;
|
||||
// throw new StopGameException(); // 4J - removed
|
||||
// throw new StopGameException(); // 4J - removed
|
||||
}
|
||||
|
||||
|
||||
lastTime = 0;
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
setType(eProgressStringType_ID);
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
setType(eProgressStringType_ID);
|
||||
this->status = status;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
progressStagePercentage(-1);
|
||||
lastTime = 0;
|
||||
}
|
||||
|
||||
void ProgressRenderer::progressStagePercentage(int i)
|
||||
{
|
||||
// 4J Stu - Removing all progressRenderer rendering. This will be replaced on the xbox
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
lastPercent = i;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
void ProgressRenderer::progressStagePercentage(int i) {
|
||||
// 4J Stu - Removing all progressRenderer rendering. This will be replaced
|
||||
// on the xbox
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
lastPercent = i;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
|
||||
#if 0
|
||||
if (!minecraft->running)
|
||||
@@ -155,60 +148,51 @@ void ProgressRenderer::progressStagePercentage(int i)
|
||||
#endif
|
||||
}
|
||||
|
||||
int ProgressRenderer::getCurrentPercent()
|
||||
{
|
||||
int returnValue = 0;
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
returnValue = lastPercent;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
return returnValue;
|
||||
int ProgressRenderer::getCurrentPercent() {
|
||||
int returnValue = 0;
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
returnValue = lastPercent;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
int ProgressRenderer::getCurrentTitle()
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
int returnValue = title;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
return returnValue;
|
||||
int ProgressRenderer::getCurrentTitle() {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
int returnValue = title;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
int ProgressRenderer::getCurrentStatus()
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
int returnValue = status;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
return returnValue;
|
||||
int ProgressRenderer::getCurrentStatus() {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
int returnValue = status;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
ProgressRenderer::eProgressStringType ProgressRenderer::getType()
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
eProgressStringType returnValue = m_eType;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
return returnValue;
|
||||
ProgressRenderer::eProgressStringType ProgressRenderer::getType() {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
eProgressStringType returnValue = m_eType;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
void ProgressRenderer::setType(eProgressStringType eType)
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
m_eType=eType;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
void ProgressRenderer::setType(eProgressStringType eType) {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
m_eType = eType;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
}
|
||||
|
||||
void ProgressRenderer::progressStage(std::wstring &wstrText)
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
m_wstrText=wstrText;
|
||||
setType(eProgressStringType_String);
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
void ProgressRenderer::progressStage(std::wstring& wstrText) {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
m_wstrText = wstrText;
|
||||
setType(eProgressStringType_String);
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
}
|
||||
|
||||
std::wstring& ProgressRenderer::getProgressString(void)
|
||||
{
|
||||
EnterCriticalSection( &ProgressRenderer::s_progress );
|
||||
std::wstring &temp=m_wstrText;
|
||||
LeaveCriticalSection( &ProgressRenderer::s_progress );
|
||||
return temp;
|
||||
std::wstring& ProgressRenderer::getProgressString(void) {
|
||||
EnterCriticalSection(&ProgressRenderer::s_progress);
|
||||
std::wstring& temp = m_wstrText;
|
||||
LeaveCriticalSection(&ProgressRenderer::s_progress);
|
||||
return temp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user