feat: remove experience
This commit is contained in:
1 parent
bdfe5350cd
commit
41d166afed
83 files changed
+47
-1501
No files matched your search
@@ -618,48 +618,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
|
||||
}
|
||||
}
|
||||
|
||||
#if RENDER_HUD
|
||||
// Moved so the opacity blend is applied to it
|
||||
if (bDisplayGui && minecraft->gameMode->hasExperience() && minecraft->player->experienceLevel > 0)
|
||||
{
|
||||
if (true)
|
||||
{
|
||||
bool blink = false;
|
||||
int col = blink ? 0xffffff : 0x80ff20;
|
||||
wchar_t formatted[10];
|
||||
swprintf(formatted, 10, L"%d",minecraft->player->experienceLevel);
|
||||
|
||||
wstring str = formatted;
|
||||
int x = iWidthOffset + (screenWidth - font->width(str)) / 2;
|
||||
int y = screenHeight - iSafezoneYHalf - iTooltipsYOffset;
|
||||
// If we're in creative mode, we don't need to offset the XP display so much
|
||||
if (minecraft->gameMode->canHurtPlayer())
|
||||
{
|
||||
y-=18;
|
||||
}
|
||||
else
|
||||
{
|
||||
y-=13;
|
||||
}
|
||||
|
||||
if(bTwoPlayerSplitscreen)
|
||||
{
|
||||
y+=iHeightOffset;
|
||||
}
|
||||
//int y = screenHeight - 31 - 4;
|
||||
font->draw(str, x + 1, y, 0x000000);
|
||||
font->draw(str, x - 1, y, 0x000000);
|
||||
font->draw(str, x, y + 1, 0x000000);
|
||||
font->draw(str, x, y - 1, 0x000000);
|
||||
// font->draw(str, x + 1, y + 1, 0x000000);
|
||||
// font->draw(str, x - 1, y + 1, 0x000000);
|
||||
// font->draw(str, x + 1, y - 1, 0x000000);
|
||||
// font->draw(str, x - 1, y - 1, 0x000000);
|
||||
font->draw(str, x, y, col);
|
||||
}
|
||||
}
|
||||
#endif // RENDER_HUD
|
||||
|
||||
// 4J - added to disable blends, which we have enabled previously to allow gui fading
|
||||
glDisable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
@@ -719,46 +677,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
|
||||
font->drawShadow(minecraft->gatherStats3(), iSafezoneXHalf+2, 32 + 30, 0xffffff);
|
||||
font->drawShadow(minecraft->gatherStats4(), iSafezoneXHalf+2, 32 + 40, 0xffffff);
|
||||
|
||||
// TERRAIN FEATURES
|
||||
int iYPos=82;
|
||||
|
||||
if(minecraft->level->dimension->id==0)
|
||||
{
|
||||
wstring wfeature[eTerrainFeature_Count];
|
||||
|
||||
wfeature[eTerrainFeature_Stronghold] = L"Stronghold: ";
|
||||
wfeature[eTerrainFeature_Mineshaft] = L"Mineshaft: ";
|
||||
wfeature[eTerrainFeature_Village] = L"Village: ";
|
||||
wfeature[eTerrainFeature_Ravine] = L"Ravine: ";
|
||||
|
||||
for(int i=0;i<app.m_vTerrainFeatures.size();i++)
|
||||
{
|
||||
FEATURE_DATA *pFeatureData=app.m_vTerrainFeatures[i];
|
||||
|
||||
wstring itemInfo = L"[" + _toString<int>( pFeatureData->x*16 ) + L", " + _toString<int>( pFeatureData->z*16 ) + L"] ";
|
||||
wfeature[pFeatureData->eTerrainFeature] += itemInfo;
|
||||
}
|
||||
|
||||
for( int i = eTerrainFeature_Stronghold; i < (int) eTerrainFeature_Count; i++ )
|
||||
{
|
||||
font->drawShadow(wfeature[i], iSafezoneXHalf + 2, iYPos, 0xffffff);
|
||||
iYPos+=10;
|
||||
}
|
||||
}
|
||||
|
||||
//font->drawShadow(minecraft->gatherStats5(), iSafezoneXHalf+2, 32 + 10, 0xffffff);
|
||||
{
|
||||
/* 4J - removed
|
||||
long max = Runtime.getRuntime().maxMemory();
|
||||
long total = Runtime.getRuntime().totalMemory();
|
||||
long free = Runtime.getRuntime().freeMemory();
|
||||
long used = total - free;
|
||||
String msg = "Used memory: " + (used * 100 / max) + "% (" + (used / 1024 / 1024) + "MB) of " + (max / 1024 / 1024) + "MB";
|
||||
drawString(font, msg, screenWidth - font.width(msg) - 2, 2, 0xe0e0e0);
|
||||
msg = "Allocated memory: " + (total * 100 / max) + "% (" + (total / 1024 / 1024) + "MB)";
|
||||
drawString(font, msg, screenWidth - font.width(msg) - 2, 12, 0xe0e0e0);
|
||||
*/
|
||||
}
|
||||
// 4J Stu - Moved these so that they don't overlap
|
||||
double xBlockPos = floor(minecraft->player->x);
|
||||
double yBlockPos = floor(minecraft->player->y);
|
||||
|
||||
Reference in new issue
Block a user