mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-24 08:22:53 +00:00
format more things i missed
This commit is contained in:
Tropical
parent
c9b90cae2c
commit
826862e79e
|
|
@ -81,7 +81,7 @@ void TeleportCommand::execute(std::shared_ptr<CommandSender> source,
|
|||
// victim.connection.teleport(destination.x, destination.y,
|
||||
// destination.z, destination.yRot, destination.xRot);
|
||||
// logAdminAction(source, "commands.tp.success", victim.getAName(),
|
||||
//destination.getAName());
|
||||
// destination.getAName());
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,67 +87,73 @@ UI_MAP_ELEMENT(m_labelsPad[e_PadBack], "LabelBack") UI_MAP_ELEMENT(
|
|||
"LabelRS_2") UI_MAP_ELEMENT(m_labelsPad[e_PadTouch],
|
||||
"LabelTouch")
|
||||
|
||||
UI_MAP_ELEMENT(m_controlLines[e_PadBack], "LineBack") UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadLT],
|
||||
"LineLT") UI_MAP_ELEMENT(m_controlLines[e_PadLB],
|
||||
"LineLB") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadDPadLeft],
|
||||
"Line"
|
||||
"Dpad"
|
||||
"Lef"
|
||||
"t")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadDPadRight],
|
||||
"LineDpadRight") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadDPadUp],
|
||||
"LineDpadUp")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadBack],
|
||||
"LineBack") UI_MAP_ELEMENT(m_controlLines[e_PadLT],
|
||||
"LineLT")
|
||||
UI_MAP_ELEMENT(m_controlLines[e_PadLB], "LineLB") UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadDPadLeft],
|
||||
"Line"
|
||||
"Dpad"
|
||||
"Lef"
|
||||
"t") UI_MAP_ELEMENT(m_controlLines[e_PadDPadRight],
|
||||
"LineDpadRight")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadDPadDown],
|
||||
"LineDpadDown") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadLS_1],
|
||||
"LineL3")
|
||||
m_controlLines[e_PadDPadUp],
|
||||
"LineDpadUp") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadDPadDown],
|
||||
"LineDpadDown")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadLS_2],
|
||||
"LineLeftStick") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadStart],
|
||||
"LineStart")
|
||||
m_controlLines[e_PadLS_1],
|
||||
"LineL3") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadLS_2],
|
||||
"LineLeftStick")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadRT],
|
||||
"LineRT") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadRB],
|
||||
"LineRB")
|
||||
m_controlLines[e_PadStart],
|
||||
"LineStart") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadRT],
|
||||
"LineRT")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadY],
|
||||
"LineY") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadB],
|
||||
"LineB")
|
||||
m_controlLines[e_PadRB],
|
||||
"LineRB") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadY],
|
||||
"LineY")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadA],
|
||||
"LineA") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadX],
|
||||
"LineX")
|
||||
m_controlLines[e_PadB],
|
||||
"LineB") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadA],
|
||||
"LineA")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines[e_PadRS_1],
|
||||
"LineR3") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadRS_2],
|
||||
"L"
|
||||
"i"
|
||||
"n"
|
||||
"e"
|
||||
"R"
|
||||
"i"
|
||||
"g"
|
||||
"h"
|
||||
"t"
|
||||
"S"
|
||||
"t"
|
||||
"i"
|
||||
"c"
|
||||
"k")
|
||||
m_controlLines[e_PadX],
|
||||
"LineX") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadRS_1],
|
||||
"Li"
|
||||
"ne"
|
||||
"R"
|
||||
"3")
|
||||
UI_MAP_ELEMENT(
|
||||
m_controlLines
|
||||
[e_PadTouch],
|
||||
"LineTouch")
|
||||
[e_PadRS_2],
|
||||
"L"
|
||||
"i"
|
||||
"n"
|
||||
"e"
|
||||
"R"
|
||||
"i"
|
||||
"g"
|
||||
"h"
|
||||
"t"
|
||||
"S"
|
||||
"t"
|
||||
"i"
|
||||
"c"
|
||||
"k") UI_MAP_ELEMENT(m_controlLines
|
||||
[e_PadTouch],
|
||||
"Li"
|
||||
"ne"
|
||||
"To"
|
||||
"uc"
|
||||
"h")
|
||||
|
||||
UI_MAP_ELEMENT(
|
||||
m_checkboxInvert,
|
||||
|
|
|
|||
|
|
@ -353,8 +353,9 @@ void C_4JProfile::Initialise(std::uint32_t dwTitleID, std::uint32_t dwOfferID,
|
|||
GAMESETTING_CLOUDS; // eGameSetting_Clouds - on
|
||||
pGameSettings->uiBitmaskValues |=
|
||||
GAMESETTING_ONLINE; // eGameSetting_GameSetting_Online - on
|
||||
pGameSettings->uiBitmaskValues |= GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends
|
||||
// - on
|
||||
pGameSettings->uiBitmaskValues |=
|
||||
GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends
|
||||
// - on
|
||||
pGameSettings->uiBitmaskValues |=
|
||||
GAMESETTING_DISPLAYUPDATEMSG; // eGameSetting_DisplayUpdateMessage
|
||||
// (counter)
|
||||
|
|
|
|||
|
|
@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format {
|
|||
// $gdraw_make_texture_begin as
|
||||
// $gdraw_texture_type)
|
||||
GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel.
|
||||
// Data is submitted as 8 bits/pixel, conversion
|
||||
// (if necessary) done by GDraw.
|
||||
// Data is submitted as 8 bits/pixel, conversion
|
||||
// (if necessary) done by GDraw.
|
||||
|
||||
// First platform-specific format index (for reference)
|
||||
GDRAW_TEXTURE_FORMAT__platform = 16,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
//
|
||||
|
||||
#define GDRAW_GL_EXTENSION_LIST \
|
||||
/* identifier import procname */ \
|
||||
/* identifier import procname */ \
|
||||
/* GL_ARB_multitexture */ \
|
||||
GLE(ActiveTexture, "ActiveTextureARB", ACTIVETEXTUREARB) \
|
||||
/* GL_ARB_texture_compression */ \
|
||||
|
|
|
|||
|
|
@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format {
|
|||
// $gdraw_make_texture_begin as
|
||||
// $gdraw_texture_type)
|
||||
GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel.
|
||||
// Data is submitted as 8 bits/pixel, conversion
|
||||
// (if necessary) done by GDraw.
|
||||
// Data is submitted as 8 bits/pixel, conversion
|
||||
// (if necessary) done by GDraw.
|
||||
|
||||
// First platform-specific format index (for reference)
|
||||
GDRAW_TEXTURE_FORMAT__platform = 16,
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ private:
|
|||
#define DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME \
|
||||
2400 // 40 mins 1200 // 20 mins //300; // 5 minutes
|
||||
|
||||
class MinecraftDynamicConfigurations {
|
||||
class MinecraftDynamicConfigurations {
|
||||
private:
|
||||
enum EDynamic_Configs {
|
||||
eDynamic_Config_Trial,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,
|
|||
|
||||
void CConsoleMinecraftApp::TemporaryCreateGameStart() {
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///From CScene_Main::OnInit
|
||||
/// From CScene_Main::OnInit
|
||||
|
||||
app.setLevelGenerationOptions(nullptr);
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() {
|
|||
app.ApplyGameSettingsChanged(0);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///From CScene_MultiGameJoinLoad::OnInit
|
||||
/// From CScene_MultiGameJoinLoad::OnInit
|
||||
MinecraftServer::resetFlags();
|
||||
|
||||
// From CScene_MultiGameJoinLoad::OnNotifyPressEx
|
||||
|
|
@ -57,7 +57,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() {
|
|||
app.SetCorruptSaveDeleted(false);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///From CScene_MultiGameCreate::CreateGame
|
||||
/// From CScene_MultiGameCreate::CreateGame
|
||||
|
||||
app.ClearTerrainFeaturePosition();
|
||||
std::wstring wWorldName = L"TestWorld";
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ LevelRenderer::LevelRenderer(Minecraft* mc, Textures* textures) {
|
|||
emptyChunks = 0;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
// sortedChunks[i] = nullptr; // 4J - removed - not
|
||||
//sorting
|
||||
// sorting
|
||||
// our chunks anymore
|
||||
chunks[i] = ClipChunkArray();
|
||||
lastPlayerCount[i] = 0;
|
||||
|
|
|
|||
|
|
@ -187,8 +187,9 @@ void FileHeader::ReadHeader(
|
|||
// : Bumped it to 6 for PS3 v1 to update map data mappings to use larger
|
||||
// PlayerUID : Bumped
|
||||
// it to 7 for Durango v1 to update map data mappings to use string
|
||||
// based PlayerUID : Bumped it to 8 for Durango v1 when to save the
|
||||
// chunks in a different compressed format
|
||||
// based PlayerUID
|
||||
// : Bumped it to 8 for Durango v1 when to save the chunks in a
|
||||
// different compressed format
|
||||
case SAVE_FILE_VERSION_COMPRESSED_CHUNK_STORAGE:
|
||||
case SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE:
|
||||
case SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE:
|
||||
|
|
|
|||
Loading…
Reference in a new issue