diff --git a/modules/client/client.lua b/modules/client/client.lua index 8bd0f4ee..acf2800d 100644 --- a/modules/client/client.lua +++ b/modules/client/client.lua @@ -41,9 +41,9 @@ function Client.init() g_window.show() -- play startup music - g_sounds.playMusic("startup.ogg", 3) - connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end }) - connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end }) + --g_sounds.playMusic("startup.ogg", 3) + --connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end }) + --connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end }) end, 0) end, 0) end diff --git a/modules/core_lib/const.lua b/modules/core_lib/const.lua index f23cd349..3d4d722c 100644 --- a/modules/core_lib/const.lua +++ b/modules/core_lib/const.lua @@ -12,7 +12,10 @@ LogWarning = 2 LogError = 3 LogFatal = 4 +MouseFocusReason = 0 +KeyboardFocusReason = 1 ActiveFocusReason = 2 +OtherFocusReason = 3 KeyboardNoModifier = 0 KeyboardCtrlModifier = 1 diff --git a/src/framework/graphics/particleemitter.cpp b/src/framework/graphics/particleemitter.cpp index 5ea25d61..8b33e37f 100644 --- a/src/framework/graphics/particleemitter.cpp +++ b/src/framework/graphics/particleemitter.cpp @@ -172,7 +172,7 @@ bool ParticleEmitter::load(const OTMLNodePtr& node) m_pColorsStops.push_back(0); if(m_pColors.size() != m_pColorsStops.size()) { - g_logger.error(stdext::format("particle colors must be equal to colorstops-1")); + g_logger.error("particle colors must be equal to colorstops-1"); return false; }