Merge branch 'master' into eternity-acs

This commit is contained in:
Ioan Chera 2016-10-25 21:22:13 +03:00
commit 93e0d12ef8
3 changed files with 3 additions and 2 deletions

View file

@ -18,7 +18,7 @@ endif
CFLAGS ?= -O2 -Wall -W CFLAGS ?= -O2 -Wall -W
LDFLAGS ?= -s LDFLAGS ?= -s
VERNUM = 154 VERNUM = 155
OBJS = \ OBJS = \
acc.o \ acc.o \

2
acc.c
View file

@ -22,7 +22,7 @@
// MACROS ------------------------------------------------------------------ // MACROS ------------------------------------------------------------------
#define VERSION_TEXT "1.54" #define VERSION_TEXT "1.55"
#define COPYRIGHT_YEARS_TEXT "1995" #define COPYRIGHT_YEARS_TEXT "1995"
// TYPES ------------------------------------------------------------------- // TYPES -------------------------------------------------------------------

View file

@ -400,6 +400,7 @@ special
-200:CheckClass(1), -200:CheckClass(1),
-201:DamageActor(6), // [arookas] -201:DamageActor(6), // [arookas]
-202:SetActorFlag(3), -202:SetActorFlag(3),
-203:SetTranslation(2),
// Eternity's // Eternity's
-300:GetLineCenterX(1), -300:GetLineCenterX(1),