compile error, lua const
This commit is contained in:
parent
14db1066fc
commit
6fce78d519
|
@ -41,9 +41,9 @@ function Client.init()
|
||||||
g_window.show()
|
g_window.show()
|
||||||
|
|
||||||
-- play startup music
|
-- play startup music
|
||||||
g_sounds.playMusic("startup.ogg", 3)
|
--g_sounds.playMusic("startup.ogg", 3)
|
||||||
connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end })
|
--connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end })
|
||||||
connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end })
|
--connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end })
|
||||||
end, 0)
|
end, 0)
|
||||||
end, 0)
|
end, 0)
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,7 +12,10 @@ LogWarning = 2
|
||||||
LogError = 3
|
LogError = 3
|
||||||
LogFatal = 4
|
LogFatal = 4
|
||||||
|
|
||||||
|
MouseFocusReason = 0
|
||||||
|
KeyboardFocusReason = 1
|
||||||
ActiveFocusReason = 2
|
ActiveFocusReason = 2
|
||||||
|
OtherFocusReason = 3
|
||||||
|
|
||||||
KeyboardNoModifier = 0
|
KeyboardNoModifier = 0
|
||||||
KeyboardCtrlModifier = 1
|
KeyboardCtrlModifier = 1
|
||||||
|
|
|
@ -172,7 +172,7 @@ bool ParticleEmitter::load(const OTMLNodePtr& node)
|
||||||
m_pColorsStops.push_back(0);
|
m_pColorsStops.push_back(0);
|
||||||
|
|
||||||
if(m_pColors.size() != m_pColorsStops.size()) {
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue