From cff452d814c40d69169ad95cdf692b7ea038bd2f Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 25 Nov 2012 13:18:41 +0000 Subject: [PATCH] Lunatic translator: update default defines. git-svn-id: https://svn.eduke32.com/eduke32@3225 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/_functio.h | 1 + polymer/eduke32/source/actors.h | 3 + polymer/eduke32/source/gamedef.c | 1 + polymer/eduke32/source/lunatic/con_lang.lua | 100 +++++++++++++++++++- 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/source/_functio.h b/polymer/eduke32/source/_functio.h index 6b0de6c7a..a9fa5e0bb 100644 --- a/polymer/eduke32/source/_functio.h +++ b/polymer/eduke32/source/_functio.h @@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef EXTERNC { #endif +// KEEPINSYNC lunatic/con_lang.lua char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] = { "Move_Forward", diff --git a/polymer/eduke32/source/actors.h b/polymer/eduke32/source/actors.h index 6770e6f2c..b7e52fe86 100644 --- a/polymer/eduke32/source/actors.h +++ b/polymer/eduke32/source/actors.h @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SLEEPTIME 1536 #define ZOFFSET (1<<8) +// KEEPINSYNC lunatic/con_lang.lua #define STAT_DEFAULT 0 #define STAT_ACTOR 1 #define STAT_ZOMBIEACTOR 2 @@ -180,6 +181,7 @@ typedef struct { #pragma pack(pop) +// KEEPINSYNC lunatic/con_lang.lua enum sflags_t { SPRITE_SHADOW = 0x00000001, SPRITE_NVG = 0x00000002, @@ -201,6 +203,7 @@ enum sflags_t { }; // custom projectiles +// KEEPINSYNC lunatic/con_lang.lua enum pflags_t { PROJECTILE_HITSCAN = 0x00000001, PROJECTILE_RPG = 0x00000002, diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 58fac412d..245f67951 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -5707,6 +5707,7 @@ static void C_AddDefinition(const char *lLabel,int32_t lValue,int32_t lType) g_numDefaultLabels++; } +// KEEPINSYNC lunatic/con_lang.lua static void C_AddDefaultDefinitions(void) { int32_t i; diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index f9992162d..7e979e08f 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -20,7 +20,8 @@ MAXSKILLS = 7 MAXSOUNDS = 4096 --- KEEPINSYNC gamedef.h +-- KEEPINSYNC with gamedef.c:C_AddDefaultDefinitions() and the respective +-- defines labels = { { @@ -161,6 +162,103 @@ labels = EVENT_PREGAME = 93, EVENT_CHANGEMENU = 94, }, + + { + SFLAG_SHADOW = 0x00000001, + SFLAG_NVG = 0x00000002, + SFLAG_NOSHADE = 0x00000004, + SFLAG_PROJECTILE = 0x00000008, + SFLAG_DECAL = 0x00000010, + SFLAG_BADGUY = 0x00000020, + SFLAG_NOPAL = 0x00000040, + SFLAG_NOEVENTCODE = 0x00000080, + SFLAG_NOLIGHT = 0x00000100, + SFLAG_USEACTIVATOR = 0x00000200, + SFLAG_NULL = 0x00000400, + SFLAG_NOCLIP = 0x00000800, + SFLAG_NOFLOORSHADOW = 0x00001000, + SFLAG_SMOOTHMOVE = 0x00002000, + SFLAG_NOTELEPORT = 0x00004000, +-- SFLAG_BADGUYSTAYPUT = 0x00008000, +-- SFLAG_CACHE = 0x00010000, + }, + + { + STAT_DEFAULT = 0, + STAT_ACTOR = 1, + STAT_ZOMBIEACTOR = 2, + STAT_EFFECTOR = 3, + STAT_PROJECTILE = 4, + STAT_MISC = 5, + STAT_STANDABLE = 6, + STAT_LOCATOR = 7, + STAT_ACTIVATOR = 8, + STAT_TRANSPORT = 9, + STAT_PLAYER = 10, + STAT_FX = 11, + STAT_FALLER = 12, + STAT_DUMMYPLAYER = 13, + STAT_LIGHT = 14, + }, + + { + GAMEFUNC_MOVE_FORWARD = 0, + GAMEFUNC_MOVE_BACKWARD = 1, + GAMEFUNC_TURN_LEFT = 2, + GAMEFUNC_TURN_RIGHT = 3, + GAMEFUNC_STRAFE = 4, + GAMEFUNC_FIRE = 5, + GAMEFUNC_OPEN = 6, + GAMEFUNC_RUN = 7, + GAMEFUNC_AUTORUN = 8, + GAMEFUNC_JUMP = 9, + GAMEFUNC_CROUCH = 10, + GAMEFUNC_LOOK_UP = 11, + GAMEFUNC_LOOK_DOWN = 12, + GAMEFUNC_LOOK_LEFT = 13, + GAMEFUNC_LOOK_RIGHT = 14, + GAMEFUNC_STRAFE_LEFT = 15, + GAMEFUNC_STRAFE_RIGHT = 16, + GAMEFUNC_AIM_UP = 17, + GAMEFUNC_AIM_DOWN = 18, + GAMEFUNC_WEAPON_1 = 19, + GAMEFUNC_WEAPON_2 = 20, + GAMEFUNC_WEAPON_3 = 21, + GAMEFUNC_WEAPON_4 = 22, + GAMEFUNC_WEAPON_5 = 23, + GAMEFUNC_WEAPON_6 = 24, + GAMEFUNC_WEAPON_7 = 25, + GAMEFUNC_WEAPON_8 = 26, + GAMEFUNC_WEAPON_9 = 27, + GAMEFUNC_WEAPON_10 = 28, + GAMEFUNC_INVENTORY = 29, + GAMEFUNC_INVENTORY_LEFT = 30, + GAMEFUNC_INVENTORY_RIGHT = 31, + GAMEFUNC_HOLO_DUKE = 32, + GAMEFUNC_JETPACK = 33, + GAMEFUNC_NIGHTVISION = 34, + GAMEFUNC_MEDKIT = 35, + GAMEFUNC_TURNAROUND = 36, + GAMEFUNC_SENDMESSAGE = 37, + GAMEFUNC_MAP = 38, + GAMEFUNC_SHRINK_SCREEN = 39, + GAMEFUNC_ENLARGE_SCREEN = 40, + GAMEFUNC_CENTER_VIEW = 41, + GAMEFUNC_HOLSTER_WEAPON = 42, + GAMEFUNC_SHOW_OPPONENTS_WEAPON = 43, + GAMEFUNC_MAP_FOLLOW_MODE = 44, + GAMEFUNC_SEE_COOP_VIEW = 45, + GAMEFUNC_MOUSE_AIMING = 46, + GAMEFUNC_TOGGLE_CROSSHAIR = 47, + GAMEFUNC_STEROIDS = 48, + GAMEFUNC_QUICK_KICK = 49, + GAMEFUNC_NEXT_WEAPON = 50, + GAMEFUNC_PREVIOUS_WEAPON = 51, +-- GAMEFUNC_SHOW_CONSOLE = 52, + GAMEFUNC_SHOW_DUKEMATCH_SCORES = 53, + GAMEFUNC_DPAD_SELECT = 54, + GAMEFUNC_DPAD_AIMING = 55, + } }