Christoph Oelckers
251cdacf26
Merge branch 'master' into scripting
...
Conflicts:
src/g_shared/a_randomspawner.cpp
src/g_strife/a_strifeweapons.cpp
src/thingdef/thingdef_parse.cpp
wadsrc/static/actors/constants.txt
2013-09-03 09:01:28 +02:00
Randy Heit
33ee8f9fef
Merge branch 'maint'
2013-08-29 22:27:49 -05:00
Randy Heit
7143ae49e1
Fixed: CheckPlayerCamera not sync safe
...
- If a player is spying through another player, CheckPlayerCamera will
return the TID of the player you are "spying", but as coopspy isn't a
net command, this wont be reflected by all nodes. So to fix this,
CheckPlayerCamera now returns -1 if a player's camera is that of any
player at all. (thanks edward850)
2013-08-29 21:45:37 -05:00
Randy Heit
aac0de3e48
Fixed: Make A_SetTics work with weapons.
...
- When A_SetTics is called from a weapon, we need to set the tics for the
psprite instead of the actor itself.
2013-08-29 21:40:01 -05:00
Braden Obrzut
0fb37ca5f1
Merge branch 'maint'
2013-08-27 20:41:10 -04:00
Braden Obrzut
5079d6c505
- Fixed: clang 32-bit compile (I hear it still doesn't run though).
...
- Applied edward's patch to remove boolean increment.
2013-08-27 20:28:38 -04:00
Randy Heit
956d754804
DECORATE cleanup
...
- Remove some ExpVal stuff that wasn't used.
2013-08-23 22:17:08 -05:00
Randy Heit
2f7183b937
Use PField instead of PSymbolVariable for DECORATE expressions
...
- The type systems used by PField and FxExpression are completely
incompatible, but I think I got the differences taken care of as far
as ParseNativeVariable(), ParseUserVariable(), and FxClassMember are
concerned.
- Support for declaring native bool variables has been removed for the time
being. It wasn't used anyway.
- Removed PSymbolVariable.
2013-08-23 22:02:51 -05:00
Randy Heit
a69089ffd7
Change disassembly dumps to be controlled from one spot
...
- Instead of changing three places to turn disassembly dumps on and off,
do it with just one place. As a side effect, this now handles the case
where the dump file can't be opened.
2013-08-23 21:43:56 -05:00
Randy Heit
3f6c3fa927
Remove unused GetVariableValue()
2013-08-21 23:19:46 -05:00
Randy Heit
d798c7896c
Remove FxGlobalVariable class
2013-08-21 23:01:41 -05:00
Randy Heit
01822c002f
Use PField instead of PSymbolVariable for A_SetUserVar/Array
2013-08-21 22:58:12 -05:00
Randy Heit
6198c000af
Fix A_DropItem from merge
2013-08-21 22:31:40 -05:00
Christoph Oelckers
3e4678765b
Merge branch 'master' into scripting
...
Conflicts:
src/actor.h
src/thingdef/thingdef_codeptr.cpp
2013-08-18 12:18:59 +02:00
Randy Heit
5fe5fe7c51
Merge branch 'scripting' of github.com:rheit/zdoom into scripting
2013-08-14 22:15:28 -05:00
Randy Heit
cf87d0f1e9
Use PFunction instead of PSymbolActionFunction in DECORATE parser
2013-08-14 22:00:16 -05:00
Christoph Oelckers
7a87e08107
- added MF7_ALWAYSTELEFRAG flag that causes an actor to be telefragged by everything that teleports into the same place.
2013-08-13 21:01:14 +02:00
Christoph Oelckers
61c94648dc
- added ACS CheckFlag function.
2013-08-12 22:38:52 +02:00
Christoph Oelckers
aa03609b69
- added IF_TOSSED inventory flag.
2013-08-12 21:00:23 +02:00
Christoph Oelckers
be1a00c537
Merge branch 'maint'
2013-08-12 20:42:21 +02:00
Christoph Oelckers
e14590d8ce
- moved NOTELESTOMP to flags7. When committing I was accidentally on maint instead of master and in master flags6 was already full.
2013-08-12 20:41:33 +02:00
Christoph Oelckers
44a1b94ad9
- added MF6_NOTELESTOMP flag that prevents an actor from telefragging under all possible circumstances.
2013-08-12 20:23:54 +02:00
Christoph Oelckers
f2c250d35d
- flags7 variable added to AActor.
2013-08-12 20:09:21 +02:00
Christoph Oelckers
2bcc5cd7cc
Merge branch 'maint'
2013-08-12 09:14:18 +02:00
Christoph Oelckers
ecfe67dd78
- removed weirdness from Powerup.Strength property that was specifically tailored to its use on PowerInvisibility and made its use problematic elsewhere.
2013-08-12 09:13:55 +02:00
Christoph Oelckers
fabf8272e6
Merge branch 'maint'
2013-08-11 21:04:17 +02:00
Christoph Oelckers
c0174ea7cd
- Added A_DropItem for DECORATE.
2013-08-11 20:48:08 +02:00
Christoph Oelckers
c8f0df44f2
Merge branch 'maint'
...
Conflicts:
src/am_map.cpp
2013-08-10 09:41:50 +02:00
Christoph Oelckers
25ec3fb8fe
- added MF6_RELATIVETOFLOOR flag.
2013-08-10 09:32:55 +02:00
Christoph Oelckers
211d293002
- added MF6_NOTONAUTOMAP flag to exclude things from being shown with the scanner powerup. The IDDT cheat will not be affected by this.
2013-08-10 08:53:37 +02:00
Christoph Oelckers
9c12c03684
Merge branch 'maint'
2013-08-09 20:36:08 +02:00
Christoph Oelckers
a78ad3188b
- added MF5_NOFORWARDFALL flag to prevent attacks from making its victim fall forward randomly.
2013-08-09 20:20:23 +02:00
Christoph Oelckers
bba092cc0b
Merge branch 'master' into scripting
...
Conflicts:
src/d_player.h
src/g_doom/a_archvile.cpp
src/thingdef/thingdef.h
src/thingdef/thingdef_properties.cpp
2013-08-09 13:03:28 +02:00
Christoph Oelckers
21bce3b0c4
Merge branch 'maint'
2013-08-09 12:51:26 +02:00
Christoph Oelckers
34b71baad1
- added Player.Aircapacity property which is used as a multiplier for the level's air supply.
2013-08-09 11:57:14 +02:00
Randy Heit
5cc8a9c2a7
Remove redundant Resolves
...
- ParseExpression() calls Resolve() on the FxExpression before returing
it, so there's no need to immediately Resolve() what it returns.
2013-08-02 21:19:05 -05:00
Randy Heit
4f528e3832
Remove lax from FCompileContext
...
- It's always set to true these days, so let's get rid of it.
2013-08-02 21:13:40 -05:00
Randy Heit
09c902ce55
Remove isconst from FCompileContext.
...
- It's not used anymore, so keeping it around is pointless.
2013-08-02 21:09:49 -05:00
Edoardo Prezioso
0dc70f847c
- Be more compatible with C++11 narrowing conversions system.
2013-07-31 12:27:54 +02:00
Edoardo Prezioso
8cab8f180b
- Be clear about the safe 'memset/memcpy' operations on virtual classes.
...
Since I remember that 'memset/memcpy' is safe in this code, it should be okay to cast to the generic pointer all the 'virtual class' arguments before calling the above functions. Shuts up Clang warnings.
2013-07-31 12:23:31 +02:00
Randy Heit
58f088c1ab
Remove FxExpression::EvalExpression() entirely
...
- For the purposes of getting constant values from expressions, the only
class where Resolve doesn't duplicate the functionality of
EvalExpression was FxConstant. So, every other class has had its
EvalExpression taken away, and FxConstant has had it renamed to GetValue.
2013-07-30 22:52:27 -05:00
Randy Heit
c810b4d724
Use new degree FLOPs for DECORATE expressions.
...
- Now that the VM supports degrees, use those instructions when emitting
code for cos and sin DECORATE expressions. (This looks like it also
fixed a bug where sqrt also did the degree to radian conversion.)
2013-07-28 20:31:23 -05:00
Randy Heit
0468b1f9ce
Delete default expressions for action definitions
...
- After StateParams was removed in commit 4a1fbdb
, the expressions for
default paramaters that ParseActionDef() created went nowhere and were
lost. Properly throw them away by deleting them as soon as they've been
parsed.
2013-07-28 20:05:07 -05:00
Randy Heit
241622300e
Removed some EvalExpression implementations
...
- Removed EvalExpression() implementations from some subclasses of
FxExpression that don't make any sense in the context of evaluating a
constant value.
2013-07-28 19:40:48 -05:00
Randy Heit
2c24e7f9c6
Remove self pointer from FxExpression::EvalExpression()
...
- Every place that calls this now (which are all in thingdef_parse.cpp)
passed NULL for the self pointer, so it was superfluous to have around.
2013-07-28 19:28:14 -05:00
Christoph Oelckers
909ec2e35a
Merge branch 'maint' into scripting
2013-07-28 10:47:17 +02:00
Randy Heit
4a1fbdb32a
Remove all state expression/param stuff
...
- This all became vestigial code after the relevant information was all
moved into FStateTempCall. Now that the MBF code pointer code has been
converted, I can be sure it wasn't still used anywhere.
2013-07-27 22:34:44 -05:00
Randy Heit
6cf0916f72
Use VMFunctionBuilder::EmitParamInt in thingdef_expression.cpp
2013-07-27 22:06:14 -05:00
Randy Heit
070c0a9e30
Stop leaking function damage expressions.
...
- Function damage expressions parsed from DECORATE are now stored in a
single array and deleted at the end of FinishThingdef().
2013-07-25 21:42:30 -05:00
Christoph Oelckers
cbc0b70e7c
- TransferStencilColor A_SpawnItemEx patch / by Ryan Cordell.
2013-07-24 20:15:17 +02:00