OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript

Browse source 
# Conflicts:
#	wadsrc/static/zscript.txt
This commit is contained in:
Christoph Oelckers 2016-11-30 18:46:23 +01:00
commit c927aca2a0
400 changed files with 27625 additions and 25589 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/r_data/r_interpolate.cpp
View file

@ -62,7 +62,7 @@ public:
DSectorPlaneInterpolation() {}
DSectorPlaneInterpolation(sector_t *sector, bool plane, bool attach);
void Destroy();
void Destroy() override;
void UpdateInterpolation();
void Restore();
void Interpolate(double smoothratio);
@ -91,7 +91,7 @@ public:
DSectorScrollInterpolation() {}
DSectorScrollInterpolation(sector_t *sector, bool plane);
void Destroy();
void Destroy() override;
void UpdateInterpolation();
void Restore();
void Interpolate(double smoothratio);
@ -119,7 +119,7 @@ public:
DWallScrollInterpolation() {}
DWallScrollInterpolation(side_t *side, int part);
void Destroy();
void Destroy() override;
void UpdateInterpolation();
void Restore();
void Interpolate(double smoothratio);
@ -146,7 +146,7 @@ public:
DPolyobjInterpolation() {}
DPolyobjInterpolation(FPolyObj *poly);
void Destroy();
void Destroy() override;
void UpdateInterpolation();
void Restore();
void Interpolate(double smoothratio);
@ -161,17 +161,17 @@ public:
//
//==========================================================================
IMPLEMENT_CLASS(DInterpolation, true, true, false, false)
IMPLEMENT_CLASS(DInterpolation, true, true)
IMPLEMENT_POINTERS_START(DInterpolation)
IMPLEMENT_POINTER(Next)
IMPLEMENT_POINTER(Prev)
IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(DSectorPlaneInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DSectorScrollInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DWallScrollInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DPolyobjInterpolation, false, false, false, false)
IMPLEMENT_CLASS(DSectorPlaneInterpolation, false, false)
IMPLEMENT_CLASS(DSectorScrollInterpolation, false, false)
IMPLEMENT_CLASS(DWallScrollInterpolation, false, false)
IMPLEMENT_CLASS(DPolyobjInterpolation, false, false)
//==========================================================================
//

2
src/r_data/r_interpolate.h
View file

@ -27,7 +27,7 @@ public:
int AddRef();
int DelRef(bool force = false);
virtual void Destroy();
void Destroy() override;
virtual void UpdateInterpolation() = 0;
virtual void Restore() = 0;
virtual void Interpolate(double smoothratio) = 0;

37
src/r_data/r_translate.cpp
View file

@ -1205,20 +1205,37 @@ void R_GetPlayerTranslation (int color, const FPlayerColorSet *colorset, FPlayer
//----------------------------------------------------------------------------
static TMap<FName, int> customTranslationMap;
int R_FindCustomTranslation(const char *name)
int R_FindCustomTranslation(FName name)
{
if (name == nullptr)
{
return -1;
}
// Ice is a special case which will remain in its original slot.
if (!stricmp(name, "Ice"))
switch (name)
{
case NAME_Ice:
// Ice is a special case which will remain in its original slot.
return TRANSLATION(TRANSLATION_Standard, 7);
}
else if (!stricmp(name, "None"))
{
case NAME_None:
return 0;
case NAME_RainPillar1:
case NAME_RainPillar2:
case NAME_RainPillar3:
case NAME_RainPillar4:
case NAME_RainPillar5:
case NAME_RainPillar6:
case NAME_RainPillar7:
case NAME_RainPillar8:
return TRANSLATION(TRANSLATION_RainPillar, name.GetIndex() - NAME_RainPillar1);
case NAME_Player1:
case NAME_Player2:
case NAME_Player3:
case NAME_Player4:
case NAME_Player5:
case NAME_Player6:
case NAME_Player7:
case NAME_Player8:
return TRANSLATION(TRANSLATION_Players, name.GetIndex() - NAME_Player1);
}
int *t = customTranslationMap.CheckKey(FName(name, true));
return (t != nullptr)? *t : -1;

2
src/r_data/r_translate.h
View file

@ -110,7 +110,7 @@ extern TArray<PalEntry> BloodTranslationColors;
int CreateBloodTranslation(PalEntry color);
int R_FindCustomTranslation(const char *name);
int R_FindCustomTranslation(FName name);
void R_ParseTrnslate();