diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 175a38e1f0b2f3149e6a0d65fbc36c9cbe33b6e3..97657198af2412b37aaad0014f3f8abac4f81b28 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -1766,9 +1766,9 @@ static int lib_sChangeMusic(lua_State *L) } //===================================================================== -//miru: A block where I can put my open functions to Lua...they can be organized later +//miru: A block where I, can put my open functions to Lua...they can be organized later //(or just shoved into a future mir_lua.c like before) -static int lib_sPositionMusic(lua_State *L) +static int lib_sSetMusicPosition(lua_State *L) { fixed_t fixedspeed = luaL_checkfixed(L, 1); float position = fixedspeed*0.001f; @@ -1782,15 +1782,15 @@ static int lib_sPositionMusic(lua_State *L) return LUA_ErrInvalid(L, "player_t"); } if (!player || P_IsLocalPlayer(player)) - S_PositionMusic(position); + S_SetMusicPosition(position); return 0; } -static int lib_sGetPositionMusic(lua_State *L) +static int lib_sGetMusicPosition(lua_State *L) { - float fpos = S_GetPositionMusic(); + float fpos = S_GetMusicPosition(); lua_pushnumber(L, (lua_Number)(fpos*1000)); - //CONS_Printf("GetPositionMusic: %05f\n\n\n",fpos); + //CONS_Printf("GetMusicPosition: %05f\n\n\n",fpos); return 1; } @@ -2210,8 +2210,8 @@ static luaL_Reg lib[] = { {"G_TicsToMilliseconds",lib_gTicsToMilliseconds}, //miru: Put everything added here, categorizing right now isn't something I want to wander through - {"S_PositionMusic",lib_sPositionMusic}, - {"S_GetPositionMusic",lib_sGetPositionMusic}, + {"S_SetMusicPosition",lib_sSetMusicPosition}, + {"S_GetMusicPosition",lib_sGetMusicPosition}, {"S_FadeOutMusic",lib_sFadeOutMusic}, {"P_SetActiveMotionBlur",lib_pSetActiveMotionBlur}, diff --git a/src/s_sound.c b/src/s_sound.c index 37d3f683f9608b79fa24c612fe3f66f27bf15421..571f6fd28d2523ec98a0aff50f3de88ec4944e67 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1271,12 +1271,12 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping) I_SetSongTrack(mflags & MUSIC_TRACKMASK); } -void S_PositionMusic(float position) +void S_SetMusicPosition(float position) { I_SetMusicPosition(position); } -float S_GetPositionMusic(void) +float S_GetMusicPosition(void) { return I_GetMusicPosition(); } diff --git a/src/s_sound.h b/src/s_sound.h index 063c79583690dd82816c324cc2e2eba56732c14c..dcafde1182b97fca58ed7fe6f35c2d0e57c4873a 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -111,10 +111,10 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping); //(because I'm not allowed to name it to not be as sloppily named the way it is) // Seek to a point in the current song -void S_PositionMusic(float position); +void S_SetMusicPosition(float position); // Get the current music position -float S_GetPositionMusic(void); +float S_GetMusicPosition(void); // Fade in over milliseconds of time void S_FadeInMusic(int ms);