mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-17 20:10:23 +03:00
Merge branch 'master' into master
This commit is contained in:
@@ -103,11 +103,23 @@ void AppPlatform_windows::createUserInput()
|
||||
{
|
||||
m_UserInput.clear();
|
||||
m_UserInputStatus = -1;
|
||||
|
||||
switch (m_DialogType)
|
||||
{
|
||||
case DLG_CREATE_WORLD:
|
||||
{
|
||||
// some placeholder for now
|
||||
m_UserInput.push_back("New World");
|
||||
m_UserInput.push_back("123456");
|
||||
m_UserInputStatus = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void AppPlatform_windows::showDialog(eDialogType type)
|
||||
{
|
||||
// TODO
|
||||
m_DialogType = type;
|
||||
}
|
||||
|
||||
std::string AppPlatform_windows::getDateString(int time)
|
||||
|
||||
@@ -57,6 +57,8 @@ private:
|
||||
std::vector<std::string> m_UserInput;
|
||||
int m_UserInputStatus = -1;
|
||||
|
||||
eDialogType m_DialogType;
|
||||
|
||||
bool m_bIsFocused = false;
|
||||
bool m_bGrabbedMouse = false;
|
||||
bool m_bActuallyGrabbedMouse = false;
|
||||
|
||||
@@ -143,7 +143,7 @@ void SoundSystemWindows::playAt(const SoundDesc& sound, float x, float y, float
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//Release sounds that finished playing
|
||||
for (size_t i = 0; i < m_buffers.size(); i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user