OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- started scriptifying the level intermission screen. This compiles but is not active yet.

Browse source 
- allow treatment as one-character string constants as character constants. This became necessary because name constants already use single quotes and are much harder to repurpose due to a higher degree of ambiguity.
- fixed: protected methods in structs were not usable.
This commit is contained in:
Christoph Oelckers 2017-03-18 12:16:44 +01:00
commit 1e9ef2b1df
7 changed files with 530 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/textures/texturemanager.cpp
View file

@ -1199,7 +1199,7 @@ DEFINE_ACTION_FUNCTION(_TexMan, GetSize)
{
PARAM_PROLOGUE;
PARAM_INT(texid);
auto tex = TexMan[FSetTextureID(texid)];
auto tex = TexMan.ByIndex(texid);
int x, y;
if (tex != nullptr)
{
@ -1212,11 +1212,17 @@ DEFINE_ACTION_FUNCTION(_TexMan, GetSize)
return MIN(numret, 2);
}
//==========================================================================
//
//
//
//==========================================================================
DEFINE_ACTION_FUNCTION(_TexMan, GetScaledSize)
{
PARAM_PROLOGUE;
PARAM_INT(texid);
auto tex = TexMan[FSetTextureID(texid)];
auto tex = TexMan.ByIndex(texid);
if (tex != nullptr)
{
ACTION_RETURN_VEC2(DVector2(tex->GetScaledWidthDouble(), tex->GetScaledHeightDouble()));
@ -1224,6 +1230,24 @@ DEFINE_ACTION_FUNCTION(_TexMan, GetScaledSize)
ACTION_RETURN_VEC2(DVector2(-1, -1));
}
//==========================================================================
//
//
//
//==========================================================================
DEFINE_ACTION_FUNCTION(_TexMan, CheckRealHeight)
{
PARAM_PROLOGUE;
PARAM_INT(texid);
auto tex = TexMan.ByIndex(texid);
if (tex != nullptr)
{
ACTION_RETURN_INT(tex->CheckRealHeight());
}
ACTION_RETURN_INT(-1);
}
//==========================================================================
//
// FTextureID::operator+