Fixed: rearranging resources by dragging them in the Game Configurations window was not processed.

Updated ZDoom_DECORATE.cfg.
Updated ZDoom_ACS.cfg.
Updated ZDoom ACC.
This commit is contained in:
MaxED 2016-07-30 22:23:44 +00:00
parent 14fa99515e
commit 2351922b9f
6 changed files with 37 additions and 3 deletions

Binary file not shown.

View file

@ -293,6 +293,7 @@
#define APROP_DamageMultiplier 43 #define APROP_DamageMultiplier 43
#define APROP_MaxStepHeight 44 #define APROP_MaxStepHeight 44
#define APROP_MaxDropOffHeight 45 #define APROP_MaxDropOffHeight 45
#define APROP_DamageType 46
// Render Styles ------------------------------------------------------------ // Render Styles ------------------------------------------------------------
@ -368,6 +369,8 @@
#define MRF_UNDOBYDEATH 0x00000200 #define MRF_UNDOBYDEATH 0x00000200
#define MRF_UNDOBYDEATHFORCED 0x00000400 #define MRF_UNDOBYDEATHFORCED 0x00000400
#define MRF_UNDOBYDEATHSAVES 0x00000800 #define MRF_UNDOBYDEATHSAVES 0x00000800
#define MRF_UNDOALWAYS 0x00001000
#define MRF_TRANSFERTRANSLATION 0x00002000
// Shared spawnable things from Hexen. You can spawn these in the other ----- // Shared spawnable things from Hexen. You can spawn these in the other -----
// games if you provide sprites for them, otherwise they'll be invisible. --- // games if you provide sprites for them, otherwise they'll be invisible. ---

View file

@ -358,7 +358,7 @@ special
-88:SetActorRoll(2), -88:SetActorRoll(2),
-89:ChangeActorRoll(2,3), -89:ChangeActorRoll(2,3),
-90:GetActorRoll(1), -90:GetActorRoll(1),
-91:QuakeEx(8,14), -91:QuakeEx(8,16),
-92:Warp(6,11), -92:Warp(6,11),
-93:GetMaxInventory(2), -93:GetMaxInventory(2),
-94:SetSectorDamage(2,5), -94:SetSectorDamage(2,5),

View file

@ -494,6 +494,7 @@ properties
global; global;
if; if;
int; int;
KILL;
LIGHTNING; LIGHTNING;
NET; NET;
OPEN; OPEN;
@ -927,6 +928,8 @@ constants
MRF_LOSEACTUALWEAPON; MRF_LOSEACTUALWEAPON;
MRF_NEWTIDBEHAVIOUR; MRF_NEWTIDBEHAVIOUR;
MRF_OLDEFFECTS; MRF_OLDEFFECTS;
MRF_TRANSFERTRANSLATION;
MRF_UNDOALWAYS;
MRF_UNDOBYCHAOSDEVICE; MRF_UNDOBYCHAOSDEVICE;
MRF_UNDOBYDEATH; MRF_UNDOBYDEATH;
MRF_UNDOBYDEATHFORCED; MRF_UNDOBYDEATHFORCED;

View file

@ -172,6 +172,9 @@ keywords
A_SkullPop = "A_SkullPop[(str type = \"BloodySkull\")]"; A_SkullPop = "A_SkullPop[(str type = \"BloodySkull\")]";
A_Quake = "A_Quake(int intensity, int duration, int damageradius, int tremorradius[, str sound = \"world/quake\"])"; A_Quake = "A_Quake(int intensity, int duration, int damageradius, int tremorradius[, str sound = \"world/quake\"])";
A_QuakeEx = "A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad[, str sound = \"world/quake\"[, int flags = 0[, float mulwavex = 1.0[, float mulwavey = 1.0[, float mulwavez = 1.0[, int falloff = 0[, int highpoint = 0[, float rollintensity = 0.0[, float rollwave = 0.0]]]]]]]]])"; A_QuakeEx = "A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad[, str sound = \"world/quake\"[, int flags = 0[, float mulwavex = 1.0[, float mulwavey = 1.0[, float mulwavez = 1.0[, int falloff = 0[, int highpoint = 0[, float rollintensity = 0.0[, float rollwave = 0.0]]]]]]]]])";
A_CopySpriteFrame = "A_CopySpriteFrame((int from, int to[, int flags = 0]))";
A_SetSpriteAngle = "A_SetSpriteAngle(float angle[, int ptr = AAPTR_DEFAULT])";
A_SetSpriteRotation = "A_SetSpriteRotation(float angle[, int ptr = AAPTR_DEFAULT])";
//Spawn functions //Spawn functions
A_TossGib = "A_TossGib"; A_TossGib = "A_TossGib";
A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])"; A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])";
@ -432,6 +435,7 @@ keywords
//Special functions //Special functions
CheckClass = "bool CheckClass(str classname[, int ptr_select = AAPTR_DEFAULT[, bool match_superclass = false]])"; CheckClass = "bool CheckClass(str classname[, int ptr_select = AAPTR_DEFAULT[, bool match_superclass = false]])";
CountInv = "int CountInv(str itemclassname[, int ptr_select = AAPTR_DEFAULT])"; CountInv = "int CountInv(str itemclassname[, int ptr_select = AAPTR_DEFAULT])";
CountProximity = "state CountProximity(str classname, float distance[, int flags = 0[, int ptr = AAPTR_DEFAULT]])";
GetAngle = "GetAngle(int flags[, int ptr_target = AAPTR_TARGET])\nGets the angle in degrees (normalized to -180..180)\nflags: GAF flags"; GetAngle = "GetAngle(int flags[, int ptr_target = AAPTR_TARGET])\nGets the angle in degrees (normalized to -180..180)\nflags: GAF flags";
GetCVar = "int GetCVar(str name)"; GetCVar = "int GetCVar(str name)";
GetUserCVar = "int GetUserCVar(int playernum, str name)"; GetUserCVar = "int GetUserCVar(int playernum, str name)";
@ -440,6 +444,8 @@ keywords
GetGibHealth = "int GetGibHealth()"; GetGibHealth = "int GetGibHealth()";
GetPlayerInput = "int GetPlayerInput(int numinput[, int ptr = AAPTR_DEFAULT])"; GetPlayerInput = "int GetPlayerInput(int numinput[, int ptr = AAPTR_DEFAULT])";
GetSpawnHealth = "int GetSpawnHealth()"; GetSpawnHealth = "int GetSpawnHealth()";
GetSpriteAngle = "int GetSpriteAngle(int ptr)";
GetSpriteRotation = "int GetSpriteRotation(int ptr)";
GetZAt = "float GetZAt([float x = 0.0[, float y = 0.0[, float angle = 0.0[, int flags = 0[, int pick_pointer = AAPTR_TARGET]]]]])"; GetZAt = "float GetZAt([float x = 0.0[, float y = 0.0[, float angle = 0.0[, int flags = 0[, int pick_pointer = AAPTR_TARGET]]]]])";
IsPointerEqual = "bool IsPointerEqual(int ptr1, int ptr2)"; IsPointerEqual = "bool IsPointerEqual(int ptr1, int ptr2)";
} }
@ -459,6 +465,11 @@ properties
if; if;
else; else;
return; return;
for;
while;
do;
break;
continue;
//Flow control //Flow control
Loop; Loop;
Stop; Stop;
@ -519,6 +530,7 @@ properties
User2:; User2:;
User3:; User3:;
User4:; User4:;
DeadLowered:;
//////////////////// ////////////////////
//ACTOR PROPERTIES //ACTOR PROPERTIES
//////////////////// ////////////////////
@ -595,6 +607,8 @@ properties
StencilColor; StencilColor;
FloatBobPhase; FloatBobPhase;
DistanceCheck; DistanceCheck;
SpriteAngle;
SpriteRotation;
//Obituaries //Obituaries
HitObituary; HitObituary;
Obituary; Obituary;
@ -753,6 +767,7 @@ constants
WALLSPRITE; WALLSPRITE;
DONTFLIP; DONTFLIP;
ROLLCENTER; ROLLCENTER;
SPRITEANGLE;
//pointers //pointers
AAPTR_DEFAULT; AAPTR_DEFAULT;
AAPTR_NULL; AAPTR_NULL;
@ -811,6 +826,8 @@ constants
WRF_ALLOWUSER2; WRF_ALLOWUSER2;
WRF_ALLOWUSER3; WRF_ALLOWUSER3;
WRF_ALLOWUSER4; WRF_ALLOWUSER4;
WRF_NODEATHDESELECT;
WRF_NODEATHINPUT;
ZOOM_INSTANT; ZOOM_INSTANT;
ZOOM_NOSCALETURNING; ZOOM_NOSCALETURNING;
CPF_USEAMMO; CPF_USEAMMO;
@ -918,6 +935,8 @@ constants
SEEINVISIBLE; SEEINVISIBLE;
DONTTHRUST; DONTTHRUST;
ALLOWPAIN; ALLOWPAIN;
USEKILLSCRIPTS;
NOKILLSCRIPTS;
//Defenses //Defenses
INVULNERABLE; INVULNERABLE;
BUDDHA; BUDDHA;
@ -1391,4 +1410,7 @@ constants
//GetAngle flags //GetAngle flags
GAF_RELATIVE; GAF_RELATIVE;
GAF_SWITCH; GAF_SWITCH;
//A_CopySpriteFrame flags
CPSF_NOSPRITE;
CPSF_NOFRAME;
} }

View file

@ -387,8 +387,14 @@ namespace CodeImp.DoomBuilder.Controls
// Item dropped // Item dropped
private void resourceitems_DragDrop(object sender, DragEventArgs e) private void resourceitems_DragDrop(object sender, DragEventArgs e)
{ {
if(!e.Data.GetDataPresent(DataFormats.FileDrop)) return; if(!e.Data.GetDataPresent(DataFormats.FileDrop))
{
//mxd. Items were rearranged. Raise content changed event
if(OnContentChanged != null) OnContentChanged();
return;
}
//mxd. Accept filesystem drop
string[] paths = (string[])e.Data.GetData(DataFormats.FileDrop); string[] paths = (string[])e.Data.GetData(DataFormats.FileDrop);
int addedfiles = 0; int addedfiles = 0;
foreach(string path in paths) foreach(string path in paths)