Merge branch 'master' into eternity-acs

2025-02-11 22:37:54 +00:00 · 2016-10-25 21:22:13 +03:00 · 2016-10-25 21:22:13 +03:00 · 93e0d12ef8
commit 93e0d12ef8
parent 5caf8604f1 174e7349b3
3 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@ -18,7 +18,7 @@ endif

 CFLAGS ?= -O2 -Wall -W
 LDFLAGS ?= -s
-VERNUM = 154
+VERNUM = 155

 OBJS = \
 	acc.o     \
--- a/acc.c
+++ b/acc.c
@ -22,7 +22,7 @@

 // MACROS ------------------------------------------------------------------

-#define VERSION_TEXT "1.54"
+#define VERSION_TEXT "1.55"
 #define COPYRIGHT_YEARS_TEXT "1995"

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