OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '2ec8e2c2ac' into scripting

Browse source 
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/p_local.h

(Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.
This commit is contained in:
Christoph Oelckers 2015-04-28 12:54:01 +02:00
commit 0474560ac6
147 changed files with 423 additions and 1165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_properties.cpp
View file

@ -1006,7 +1006,7 @@ DEFINE_PROPERTY(translation, L, Actor)
if (type == 0)
{
PROP_INT_PARM(trans, 1);
int max = (gameinfo.gametype==GAME_Strife || (info->GameFilter&GAME_Strife)) ? 6:2;
int max = 6;// (gameinfo.gametype == GAME_Strife || (info->GameFilter&GAME_Strife)) ? 6 : 2;
if (trans < 0 || trans > max)
{
I_Error ("Translation must be in the range [0,%d]", max);