stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-26 22:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ugly, sinful reversions of bugfixes

Browse source 
in order to maintain feature backwards-compatibility with 2.1.14 mods
This commit is contained in:
RedEnchilada 2015-12-11 22:40:19 -06:00
parent 6ee0398a1f
commit f827a50d3f
2 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/dehacked.c
View file

@ -998,7 +998,7 @@ static const struct {
static void readlevelheader(MYFILE *f, INT32 num)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
char *word;
char *word = s;
char *word2;
//char *word3; // Non-uppercase version of word2
char *tmp;
@ -1028,7 +1028,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
continue; // Skip comment lines, but don't break.
// Set / reset word, because some things (Lua.) move it
word = s;
//word = s;
// Get the part before the " = "
tmp = strchr(s, '=');
@ -7757,36 +7757,36 @@ struct {
{"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
// Angles
{"ANG1",ANG1>>16},
{"ANG2",ANG2>>16},
{"ANG10",ANG10>>16},
{"ANG15",ANG15>>16},
{"ANG20",ANG20>>16},
{"ANG30",ANG30>>16},
{"ANG60",ANG60>>16},
{"ANG64h",ANG64h>>16},
{"ANG105",ANG105>>16},
{"ANG210",ANG210>>16},
{"ANG255",ANG255>>16},
{"ANG340",ANG340>>16},
{"ANG350",ANG350>>16},
{"ANGLE_11hh",ANGLE_11hh>>16},
{"ANGLE_22h",ANGLE_22h>>16},
{"ANGLE_45",ANGLE_45>>16},
{"ANGLE_67h",ANGLE_67h>>16},
{"ANGLE_90",ANGLE_90>>16},
{"ANGLE_112h",ANGLE_112h>>16},
{"ANGLE_135",ANGLE_135>>16},
{"ANGLE_157h",ANGLE_157h>>16},
{"ANGLE_180",ANGLE_180>>16},
{"ANGLE_202h",ANGLE_202h>>16},
{"ANGLE_225",ANGLE_225>>16},
{"ANGLE_247h",ANGLE_247h>>16},
{"ANGLE_270",ANGLE_270>>16},
{"ANGLE_292h",ANGLE_292h>>16},
{"ANGLE_315",ANGLE_315>>16},
{"ANGLE_337h",ANGLE_337h>>16},
{"ANGLE_MAX",ANGLE_MAX>>16},
{"ANG1",ANG1>>0},
{"ANG2",ANG2>>0},
{"ANG10",ANG10>>0},
{"ANG15",ANG15>>0},
{"ANG20",ANG20>>0},
{"ANG30",ANG30>>0},
{"ANG60",ANG60>>0},
{"ANG64h",ANG64h>>0},
{"ANG105",ANG105>>0},
{"ANG210",ANG210>>0},
{"ANG255",ANG255>>0},
{"ANG340",ANG340>>0},
{"ANG350",ANG350>>0},
{"ANGLE_11hh",ANGLE_11hh>>0},
{"ANGLE_22h",ANGLE_22h>>0},
{"ANGLE_45",ANGLE_45>>0},
{"ANGLE_67h",ANGLE_67h>>0},
{"ANGLE_90",ANGLE_90>>0},
{"ANGLE_112h",ANGLE_112h>>0},
{"ANGLE_135",ANGLE_135>>0},
{"ANGLE_157h",ANGLE_157h>>0},
{"ANGLE_180",ANGLE_180>>0},
{"ANGLE_202h",ANGLE_202h>>0},
{"ANGLE_225",ANGLE_225>>0},
{"ANGLE_247h",ANGLE_247h>>0},
{"ANGLE_270",ANGLE_270>>0},
{"ANGLE_292h",ANGLE_292h>>0},
{"ANGLE_315",ANGLE_315>>0},
{"ANGLE_337h",ANGLE_337h>>0},
{"ANGLE_MAX",ANGLE_MAX>>0},
// P_Chase directions (dirtype_t)
{"DI_NODIR",DI_NODIR},

4
src/lua_script.h
View file

@ -31,8 +31,8 @@
// angle_t casting
// we reduce the angle to a fixed point between 0.0 and 1.0
#define luaL_checkangle(L, i) (((angle_t)(luaL_checkfixed(L, i)&0xFFFF))<<16)
#define lua_pushangle(L, a) lua_pushfixed(L, a>>16)
#define luaL_checkangle(L, i) (((angle_t)(luaL_checkfixed(L, i)&0xFFFFFFFF))<<0)
#define lua_pushangle(L, a) lua_pushfixed(L, a>>0)
#ifdef _DEBUG
void LUA_ClearExtVars(void);