lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change getSpritePatch and getSpritePatch to accept angles 1-8 instead of 0-7, and just decrement the numbers internally

Browse source 
0 now just defaults to front angle (1, or 0 internally), in case people thought it was a separate angle from 1-8 for some reason
This commit is contained in:
Monster Iestyn 2017-07-17 21:31:33 +01:00
parent e32774a604
commit 4d740ff783
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lua_hudlib.c
View file

@ -384,8 +384,15 @@ static int libd_getSpritePatch(lua_State *L)
return 0;
// set angle number
sprframe = &sprdef->spriteframes[frame];
angle = luaL_optinteger(L, 3, 0);
if (angle >= 8)
angle = luaL_optinteger(L, 3, 1);
// convert WAD editor angle numbers (1-8) to internal angle numbers (0-7)
// keep 0 the same since we'll make it default to angle 1 (which is internally 0)
// in case somebody didn't know that angle 0 really just maps all 8 angles to the same patch
if (angle != 0)
angle--;
if (angle >= 8) // out of range?
return 0;
// push both the patch and it's "flip" value
@ -470,8 +477,15 @@ static int libd_getSprite2Patch(lua_State *L)
return 0;
// set angle number
sprframe = &sprdef->spriteframes[frame];
angle = luaL_optinteger(L, 3, 0);
if (angle >= 8)
angle = luaL_optinteger(L, 3, 1);
// convert WAD editor angle numbers (1-8) to internal angle numbers (0-7)
// keep 0 the same since we'll make it default to angle 1 (which is internally 0)
// in case somebody didn't know that angle 0 really just maps all 8 angles to the same patch
if (angle != 0)
angle--;
if (angle >= 8) // out of range?
return 0;
// push both the patch and it's "flip" value