From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 23 Dec 2015 11:40:38 +0000 (+0100)
Subject: Do signal mapping in get_width/get_height.
X-Git-Tag: 1.0.0~71
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=7455834be5e9ff5818a270bf1408ebd7b2d018f9

Do signal mapping in get_width/get_height.
---

diff --git a/theme.cpp b/theme.cpp
index aed350f..4680ded 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -280,7 +280,8 @@ int InputState_get_width(lua_State* L)
 {
 	assert(lua_gettop(L) == 2);
 	InputState *input_state = (InputState *)lua_touserdata(L, 1);
-	int signal_num = luaL_checknumber(L, 2);
+	Theme *theme = get_theme_updata(L);
+	int signal_num = theme->map_signal(luaL_checknumber(L, 2));
 	BufferedFrame frame = input_state->buffered_frames[signal_num][0];
 	const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
 	lua_pushnumber(L, userdata->last_width[frame.field_number]);
@@ -291,7 +292,8 @@ int InputState_get_height(lua_State* L)
 {
 	assert(lua_gettop(L) == 2);
 	InputState *input_state = (InputState *)lua_touserdata(L, 1);
-	int signal_num = luaL_checknumber(L, 2);
+	Theme *theme = get_theme_updata(L);
+	int signal_num = theme->map_signal(luaL_checknumber(L, 2));
 	BufferedFrame frame = input_state->buffered_frames[signal_num][0];
 	const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
 	lua_pushnumber(L, userdata->last_height[frame.field_number]);