aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin/Audio/SDL/SDLAudio.cpp2
-rw-r--r--src/lua/embed/boot.lua.h2
-rw-r--r--src/lua/math/luaopen_math.cpp14
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libjin/Audio/SDL/SDLAudio.cpp b/src/libjin/Audio/SDL/SDLAudio.cpp
index 4dc9213..dd05a21 100644
--- a/src/libjin/Audio/SDL/SDLAudio.cpp
+++ b/src/libjin/Audio/SDL/SDLAudio.cpp
@@ -60,7 +60,7 @@ namespace audio
onlyonce void SDLAudio::quitSystem()
{
- SDL_CloseAudio();
+ SDL_CloseAudioDevice(audioDevice);
}
void SDLAudio::lock()
diff --git a/src/lua/embed/boot.lua.h b/src/lua/embed/boot.lua.h
index 2067953..e0c43ee 100644
--- a/src/lua/embed/boot.lua.h
+++ b/src/lua/embed/boot.lua.h
@@ -33,7 +33,7 @@ local function safecall(func, ...)
end
function jin.core.run()
- safecall(jin.core.load)
+ safecall(jin.core.onLoad)
local previous = jin.time.second()
local SEC_PER_UPDATE = 1 / conf.fps
local dt = SEC_PER_UPDATE
diff --git a/src/lua/math/luaopen_math.cpp b/src/lua/math/luaopen_math.cpp
index ea169e3..98abeab 100644
--- a/src/lua/math/luaopen_math.cpp
+++ b/src/lua/math/luaopen_math.cpp
@@ -61,13 +61,13 @@ namespace jin
}
static const luaL_Reg f[] = {
- { "and", l_and },
- { "or" , l_or },
- { "xor", l_xor },
- { "not", l_not },
- { "lshift", l_lshift },
- { "rshift", l_rshift },
- { "inc", l_include},
+ { "AND", l_and },
+ { "OR" , l_or },
+ { "XOR", l_xor },
+ { "NOT", l_not },
+ { "LSHIFT", l_lshift },
+ { "RSHIFT", l_rshift },
+ { "INC", l_include},
{ 0, 0 }
};