Merge https://github.com/coelckers/gzdoom

2017-01-06 22:06:25 -05:00 · 2017-01-06 22:06:25 -05:00 · de5f5a1221
commit de5f5a1221
parent 3548f17f01 62ea83a35a
30 changed files with 628 additions and 554 deletions
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@ -138,10 +138,10 @@ DPSprite::DPSprite(player_t *owner, AActor *caller, int id)
 : x(.0), y(.0),
  oldx(.0), oldy(.0),
  firstTic(true),
-  Sprite(0),
  Flags(0),
  Caller(caller),
  Owner(owner),
+  Sprite(0),
  ID(id),
  processPending(true),
  alpha(1),