From 04c9f99620580d82e3cf08af8a5830d4256bdde3 Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 18 Nov 2018 18:10:04 +0000 Subject: [PATCH] Add a new member to memberlabel_t to hold the offset of a structure member for CON access. This will be used in a future commit. git-svn-id: https://svn.eduke32.com/eduke32@7188 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/gamedef.cpp | 1109 ++++++++++++++++----------------- source/duke3d/src/gamedef.h | 22 +- 2 files changed, 562 insertions(+), 569 deletions(-) diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 879ec2e09..08b00c3f6 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -775,588 +775,581 @@ const char *EventNames[MAXEVENTS] = }; #if !defined LUNATIC +#define LABEL_SETUP(struct, memb, idx) \ + { \ + #memb, idx, sizeof(struct[0].memb) | (is_unsigned ::value ? LABEL_UNSIGNED : 0), 0, \ + offsetof(std::remove_pointer ::type, memb) \ + } + const memberlabel_t SectorLabels[]= { - { "wallptr", SECTOR_WALLPTR, 0, 0 }, - { "wallnum", SECTOR_WALLNUM, 0, 0 }, - { "ceilingz", SECTOR_CEILINGZ, 0, 0 }, - { "ceilingzgoal", SECTOR_CEILINGZGOAL, 0, 0 }, - { "ceilingzvel", SECTOR_CEILINGZVEL, 0, 0 }, - { "floorz", SECTOR_FLOORZ, 0, 0 }, - { "floorzgoal", SECTOR_FLOORZGOAL, 0, 0 }, - { "floorzvel", SECTOR_FLOORZVEL, 0, 0 }, - { "ceilingstat", SECTOR_CEILINGSTAT, 0, 0 }, - { "floorstat", SECTOR_FLOORSTAT, 0, 0 }, - { "ceilingpicnum", SECTOR_CEILINGPICNUM, 0, 0 }, - { "ceilingslope", SECTOR_CEILINGSLOPE, 0, 0 }, - { "ceilingshade", SECTOR_CEILINGSHADE, 0, 0 }, - { "ceilingpal", SECTOR_CEILINGPAL, 0, 0 }, - { "ceilingxpanning", SECTOR_CEILINGXPANNING, 0, 0 }, - { "ceilingypanning", SECTOR_CEILINGYPANNING, 0, 0 }, - { "floorpicnum", SECTOR_FLOORPICNUM, 0, 0 }, - { "floorslope", SECTOR_FLOORSLOPE, 0, 0 }, - { "floorshade", SECTOR_FLOORSHADE, 0, 0 }, - { "floorpal", SECTOR_FLOORPAL, 0, 0 }, - { "floorxpanning", SECTOR_FLOORXPANNING, 0, 0 }, - { "floorypanning", SECTOR_FLOORYPANNING, 0, 0 }, - { "visibility", SECTOR_VISIBILITY, 0, 0 }, - { "fogpal", SECTOR_FOGPAL, 0, 0 }, // formerly filler - { "alignto", SECTOR_FOGPAL, 0, 0 }, // formerly filler - { "lotag", SECTOR_LOTAG, 0, 0 }, - { "hitag", SECTOR_HITAG, 0, 0 }, - { "extra", SECTOR_EXTRA, 0, 0 }, - { "ceilingbunch", SECTOR_CEILINGBUNCH, 0, 0 }, - { "floorbunch", SECTOR_FLOORBUNCH, 0, 0 }, - { "ulotag", SECTOR_ULOTAG, 0, 0 }, - { "uhitag", SECTOR_UHITAG, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + { "wallptr", SECTOR_WALLPTR, 0, 0, -1 }, + { "wallnum", SECTOR_WALLNUM, 0, 0, -1 }, + { "ceilingz", SECTOR_CEILINGZ, 0, 0, -1 }, + { "ceilingzgoal", SECTOR_CEILINGZGOAL, 0, 0, -1 }, + { "ceilingzvel", SECTOR_CEILINGZVEL, 0, 0, -1 }, + { "floorz", SECTOR_FLOORZ, 0, 0, -1 }, + { "floorzgoal", SECTOR_FLOORZGOAL, 0, 0, -1 }, + { "floorzvel", SECTOR_FLOORZVEL, 0, 0, -1 }, + { "ceilingstat", SECTOR_CEILINGSTAT, 0, 0, -1 }, + { "floorstat", SECTOR_FLOORSTAT, 0, 0, -1 }, + { "ceilingpicnum", SECTOR_CEILINGPICNUM, 0, 0, -1 }, + { "ceilingslope", SECTOR_CEILINGSLOPE, 0, 0, -1 }, + { "ceilingshade", SECTOR_CEILINGSHADE, 0, 0, -1 }, + { "ceilingpal", SECTOR_CEILINGPAL, 0, 0, -1 }, + { "ceilingxpanning", SECTOR_CEILINGXPANNING, 0, 0, -1 }, + { "ceilingypanning", SECTOR_CEILINGYPANNING, 0, 0, -1 }, + { "floorpicnum", SECTOR_FLOORPICNUM, 0, 0, -1 }, + { "floorslope", SECTOR_FLOORSLOPE, 0, 0, -1 }, + { "floorshade", SECTOR_FLOORSHADE, 0, 0, -1 }, + { "floorpal", SECTOR_FLOORPAL, 0, 0, -1 }, + { "floorxpanning", SECTOR_FLOORXPANNING, 0, 0, -1 }, + { "floorypanning", SECTOR_FLOORYPANNING, 0, 0, -1 }, + { "visibility", SECTOR_VISIBILITY, 0, 0, -1 }, + { "fogpal", SECTOR_FOGPAL, 0, 0, -1 }, // formerly filler + { "alignto", SECTOR_FOGPAL, 0, 0, -1 }, // formerly filler + { "lotag", SECTOR_LOTAG, 0, 0, -1 }, + { "hitag", SECTOR_HITAG, 0, 0, -1 }, + { "extra", SECTOR_EXTRA, 0, 0, -1 }, + { "ceilingbunch", SECTOR_CEILINGBUNCH, 0, 0, -1 }, + { "floorbunch", SECTOR_FLOORBUNCH, 0, 0, -1 }, + { "ulotag", SECTOR_ULOTAG, 0, 0, -1 }, + { "uhitag", SECTOR_UHITAG, 0, 0, -1 }, }; const memberlabel_t WallLabels[]= { - { "x", WALL_X, 0, 0 }, - { "y", WALL_Y, 0, 0 }, - { "point2", WALL_POINT2, 0, 0 }, - { "nextwall", WALL_NEXTWALL, 0, 0 }, - { "nextsector", WALL_NEXTSECTOR, 0, 0 }, - { "cstat", WALL_CSTAT, 0, 0 }, - { "picnum", WALL_PICNUM, 0, 0 }, - { "overpicnum", WALL_OVERPICNUM, 0, 0 }, - { "shade", WALL_SHADE, 0, 0 }, - { "pal", WALL_PAL, 0, 0 }, - { "xrepeat", WALL_XREPEAT, 0, 0 }, - { "yrepeat", WALL_YREPEAT, 0, 0 }, - { "xpanning", WALL_XPANNING, 0, 0 }, - { "ypanning", WALL_YPANNING, 0, 0 }, - { "lotag", WALL_LOTAG, 0, 0 }, - { "hitag", WALL_HITAG, 0, 0 }, - { "extra", WALL_EXTRA, 0, 0 }, - { "ulotag", WALL_ULOTAG, 0, 0 }, - { "uhitag", WALL_UHITAG, 0, 0 }, - { "blend", WALL_BLEND, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + { "x", WALL_X, 0, 0, -1 }, + { "y", WALL_Y, 0, 0, -1 }, + { "point2", WALL_POINT2, 0, 0, -1 }, + { "nextwall", WALL_NEXTWALL, 0, 0, -1 }, + { "nextsector", WALL_NEXTSECTOR, 0, 0, -1 }, + { "cstat", WALL_CSTAT, 0, 0, -1 }, + { "picnum", WALL_PICNUM, 0, 0, -1 }, + { "overpicnum", WALL_OVERPICNUM, 0, 0, -1 }, + { "shade", WALL_SHADE, 0, 0, -1 }, + { "pal", WALL_PAL, 0, 0, -1 }, + { "xrepeat", WALL_XREPEAT, 0, 0, -1 }, + { "yrepeat", WALL_YREPEAT, 0, 0, -1 }, + { "xpanning", WALL_XPANNING, 0, 0, -1 }, + { "ypanning", WALL_YPANNING, 0, 0, -1 }, + { "lotag", WALL_LOTAG, 0, 0, -1 }, + { "hitag", WALL_HITAG, 0, 0, -1 }, + { "extra", WALL_EXTRA, 0, 0, -1 }, + { "ulotag", WALL_ULOTAG, 0, 0, -1 }, + { "uhitag", WALL_UHITAG, 0, 0, -1 }, + { "blend", WALL_BLEND, 0, 0, -1 }, }; const memberlabel_t ActorLabels[]= { - { "x", ACTOR_X, 0, 0 }, - { "y", ACTOR_Y, 0, 0 }, - { "z", ACTOR_Z, 0, 0 }, - { "cstat", ACTOR_CSTAT, 0, 0 }, - { "picnum", ACTOR_PICNUM, 0, 0 }, - { "shade", ACTOR_SHADE, 0, 0 }, - { "pal", ACTOR_PAL, 0, 0 }, - { "clipdist", ACTOR_CLIPDIST, 0, 0 }, -// { "filler", ACTOR_DETAIL, 0, 0 }, - { "blend", ACTOR_DETAIL, 0, 0 }, - { "xrepeat", ACTOR_XREPEAT, 0, 0 }, - { "yrepeat", ACTOR_YREPEAT, 0, 0 }, - { "xoffset", ACTOR_XOFFSET, 0, 0 }, - { "yoffset", ACTOR_YOFFSET, 0, 0 }, - { "sectnum", ACTOR_SECTNUM, 0, 0 }, - { "statnum", ACTOR_STATNUM, 0, 0 }, - { "ang", ACTOR_ANG, 0, 0 }, - { "owner", ACTOR_OWNER, 0, 0 }, - { "xvel", ACTOR_XVEL, 0, 0 }, - { "yvel", ACTOR_YVEL, 0, 0 }, - { "zvel", ACTOR_ZVEL, 0, 0 }, - { "lotag", ACTOR_LOTAG, 0, 0 }, - { "hitag", ACTOR_HITAG, 0, 0 }, - { "extra", ACTOR_EXTRA, 0, 0 }, + { "x", ACTOR_X, 0, 0, -1 }, + { "y", ACTOR_Y, 0, 0, -1 }, + { "z", ACTOR_Z, 0, 0, -1 }, + { "cstat", ACTOR_CSTAT, 0, 0, -1 }, + { "picnum", ACTOR_PICNUM, 0, 0, -1 }, + { "shade", ACTOR_SHADE, 0, 0, -1 }, + { "pal", ACTOR_PAL, 0, 0, -1 }, + { "clipdist", ACTOR_CLIPDIST, 0, 0, -1 }, +// { "filler", ACTOR_DETAIL, 0, 0, -1 }, + { "blend", ACTOR_DETAIL, 0, 0, -1 }, + { "xrepeat", ACTOR_XREPEAT, 0, 0, -1 }, + { "yrepeat", ACTOR_YREPEAT, 0, 0, -1 }, + { "xoffset", ACTOR_XOFFSET, 0, 0, -1 }, + { "yoffset", ACTOR_YOFFSET, 0, 0, -1 }, + { "sectnum", ACTOR_SECTNUM, 0, 0, -1 }, + { "statnum", ACTOR_STATNUM, 0, 0, -1 }, + { "ang", ACTOR_ANG, 0, 0, -1 }, + { "owner", ACTOR_OWNER, 0, 0, -1 }, + { "xvel", ACTOR_XVEL, 0, 0, -1 }, + { "yvel", ACTOR_YVEL, 0, 0, -1 }, + { "zvel", ACTOR_ZVEL, 0, 0, -1 }, + { "lotag", ACTOR_LOTAG, 0, 0, -1 }, + { "hitag", ACTOR_HITAG, 0, 0, -1 }, + { "extra", ACTOR_EXTRA, 0, 0, -1 }, // ActorExtra labels... - { "htcgg", ACTOR_HTCGG, 0, 0 }, - { "htpicnum", ACTOR_HTPICNUM, 0, 0 }, - { "htang", ACTOR_HTANG, 0, 0 }, - { "htextra", ACTOR_HTEXTRA, 0, 0 }, - { "htowner", ACTOR_HTOWNER, 0, 0 }, - { "htmovflag", ACTOR_HTMOVFLAG, 0, 0 }, - { "httempang", ACTOR_HTTEMPANG, 0, 0 }, - { "htactorstayput", ACTOR_HTSTAYPUT, 0, 0 }, - { "htdispicnum", ACTOR_HTDISPICNUM, 0, 0 }, - { "httimetosleep", ACTOR_HTTIMETOSLEEP, 0, 0 }, - { "htfloorz", ACTOR_HTFLOORZ, 0, 0 }, - { "htceilingz", ACTOR_HTCEILINGZ, 0, 0 }, - { "htlastvx", ACTOR_HTLASTVX, 0, 0 }, - { "htlastvy", ACTOR_HTLASTVY, 0, 0 }, - { "htbposx", ACTOR_HTBPOSX, 0, 0 }, - { "htbposy", ACTOR_HTBPOSY, 0, 0 }, - { "htbposz", ACTOR_HTBPOSZ, 0, 0 }, - { "htg_t", ACTOR_HTG_T, LABEL_HASPARM2, 10 }, + { "htcgg", ACTOR_HTCGG, 0, 0, -1 }, + { "htpicnum", ACTOR_HTPICNUM, 0, 0, -1 }, + { "htang", ACTOR_HTANG, 0, 0, -1 }, + { "htextra", ACTOR_HTEXTRA, 0, 0, -1 }, + { "htowner", ACTOR_HTOWNER, 0, 0, -1 }, + { "htmovflag", ACTOR_HTMOVFLAG, 0, 0, -1 }, + { "httempang", ACTOR_HTTEMPANG, 0, 0, -1 }, + { "htactorstayput", ACTOR_HTSTAYPUT, 0, 0, -1 }, + { "htdispicnum", ACTOR_HTDISPICNUM, 0, 0, -1 }, + { "httimetosleep", ACTOR_HTTIMETOSLEEP, 0, 0, -1 }, + { "htfloorz", ACTOR_HTFLOORZ, 0, 0, -1 }, + { "htceilingz", ACTOR_HTCEILINGZ, 0, 0, -1 }, + { "htlastvx", ACTOR_HTLASTVX, 0, 0, -1 }, + { "htlastvy", ACTOR_HTLASTVY, 0, 0, -1 }, + { "htbposx", ACTOR_HTBPOSX, 0, 0, -1 }, + { "htbposy", ACTOR_HTBPOSY, 0, 0, -1 }, + { "htbposz", ACTOR_HTBPOSZ, 0, 0, -1 }, + { "htg_t", ACTOR_HTG_T, LABEL_HASPARM2, 10, -1 }, // model flags - { "angoff", ACTOR_ANGOFF, 0, 0 }, - { "pitch", ACTOR_PITCH, 0, 0 }, - { "roll", ACTOR_ROLL, 0, 0 }, - { "mdxoff", ACTOR_MDXOFF, 0, 0 }, - { "mdyoff", ACTOR_MDYOFF, 0, 0 }, - { "mdzoff", ACTOR_MDZOFF, 0, 0 }, - { "mdflags", ACTOR_MDFLAGS, 0, 0 }, - { "xpanning", ACTOR_XPANNING, 0, 0 }, - { "ypanning", ACTOR_YPANNING, 0, 0 }, + { "angoff", ACTOR_ANGOFF, 0, 0, -1 }, + { "pitch", ACTOR_PITCH, 0, 0, -1 }, + { "roll", ACTOR_ROLL, 0, 0, -1 }, + { "mdxoff", ACTOR_MDXOFF, 0, 0, -1 }, + { "mdyoff", ACTOR_MDYOFF, 0, 0, -1 }, + { "mdzoff", ACTOR_MDZOFF, 0, 0, -1 }, + { "mdflags", ACTOR_MDFLAGS, 0, 0, -1 }, + { "xpanning", ACTOR_XPANNING, 0, 0, -1 }, + { "ypanning", ACTOR_YPANNING, 0, 0, -1 }, - { "htflags", ACTOR_HTFLAGS, 0, 0 }, + { "htflags", ACTOR_HTFLAGS, 0, 0, -1 }, - { "alpha", ACTOR_ALPHA, 0, 0 }, + { "alpha", ACTOR_ALPHA, 0, 0, -1 }, - { "ulotag", ACTOR_ULOTAG, 0, 0 }, - { "uhitag", ACTOR_UHITAG, 0, 0 }, + { "ulotag", ACTOR_ULOTAG, 0, 0, -1 }, + { "uhitag", ACTOR_UHITAG, 0, 0, -1 }, - { "isvalid", ACTOR_ISVALID, 0, 0 }, + { "isvalid", ACTOR_ISVALID, 0, 0, -1 }, // aliases: - { "movflags", ACTOR_HITAG, 0, 0 }, - { "detail", ACTOR_DETAIL, 0, 0 }, // deprecated name for 'blend' - - { NULL, -1, 0, 0 } // END OF LIST + { "movflags", ACTOR_HITAG, 0, 0, -1 }, + { "detail", ACTOR_DETAIL, 0, 0, -1 }, // deprecated name for 'blend' }; const memberlabel_t TsprLabels[]= { // tsprite access - { "tsprx", ACTOR_X, 0, 0 }, - { "tspry", ACTOR_Y, 0, 0 }, - { "tsprz", ACTOR_Z, 0, 0 }, - { "tsprcstat", ACTOR_CSTAT, 0, 0 }, - { "tsprpicnum", ACTOR_PICNUM, 0, 0 }, - { "tsprshade", ACTOR_SHADE, 0, 0 }, - { "tsprpal", ACTOR_PAL, 0, 0 }, - { "tsprclipdist", ACTOR_CLIPDIST, 0, 0 }, -// { "tsprfiller", ACTOR_DETAIL, 0, 0 }, - { "tsprblend", ACTOR_DETAIL, 0, 0 }, - { "tsprxrepeat", ACTOR_XREPEAT, 0, 0 }, - { "tspryrepeat", ACTOR_YREPEAT, 0, 0 }, - { "tsprxoffset", ACTOR_XOFFSET, 0, 0 }, - { "tspryoffset", ACTOR_YOFFSET, 0, 0 }, - { "tsprsectnum", ACTOR_SECTNUM, 0, 0 }, - { "tsprstatnum", ACTOR_STATNUM, 0, 0 }, - { "tsprang", ACTOR_ANG, 0, 0 }, - { "tsprowner", ACTOR_OWNER, 0, 0 }, + { "tsprx", ACTOR_X, 0, 0, -1 }, + { "tspry", ACTOR_Y, 0, 0, -1 }, + { "tsprz", ACTOR_Z, 0, 0, -1 }, + { "tsprcstat", ACTOR_CSTAT, 0, 0, -1 }, + { "tsprpicnum", ACTOR_PICNUM, 0, 0, -1 }, + { "tsprshade", ACTOR_SHADE, 0, 0, -1 }, + { "tsprpal", ACTOR_PAL, 0, 0, -1 }, + { "tsprclipdist", ACTOR_CLIPDIST, 0, 0, -1 }, +// { "tsprfiller", ACTOR_DETAIL, 0, 0, -1 }, + { "tsprblend", ACTOR_DETAIL, 0, 0, -1 }, + { "tsprxrepeat", ACTOR_XREPEAT, 0, 0, -1 }, + { "tspryrepeat", ACTOR_YREPEAT, 0, 0, -1 }, + { "tsprxoffset", ACTOR_XOFFSET, 0, 0, -1 }, + { "tspryoffset", ACTOR_YOFFSET, 0, 0, -1 }, + { "tsprsectnum", ACTOR_SECTNUM, 0, 0, -1 }, + { "tsprstatnum", ACTOR_STATNUM, 0, 0, -1 }, + { "tsprang", ACTOR_ANG, 0, 0, -1 }, + { "tsprowner", ACTOR_OWNER, 0, 0, -1 }, #if 1 - { "tsprxvel", ACTOR_XVEL, 0, 0 }, - { "tspryvel", ACTOR_YVEL, 0, 0 }, - { "tsprzvel", ACTOR_ZVEL, 0, 0 }, - { "tsprlotag", ACTOR_LOTAG, 0, 0 }, - { "tsprhitag", ACTOR_HITAG, 0, 0 }, - { "tsprextra", ACTOR_EXTRA, 0, 0 }, + { "tsprxvel", ACTOR_XVEL, 0, 0, -1 }, + { "tspryvel", ACTOR_YVEL, 0, 0, -1 }, + { "tsprzvel", ACTOR_ZVEL, 0, 0, -1 }, + { "tsprlotag", ACTOR_LOTAG, 0, 0, -1 }, + { "tsprhitag", ACTOR_HITAG, 0, 0, -1 }, + { "tsprextra", ACTOR_EXTRA, 0, 0, -1 }, #endif // aliases: - { "tsprdetail", ACTOR_DETAIL, 0, 0 }, // deprecated name for 'tsprblend' + { "tsprdetail", ACTOR_DETAIL, 0, 0, -1 }, // deprecated name for 'tsprblend' - { NULL, -1, 0, 0 } // END OF LIST }; const memberlabel_t PlayerLabels[]= { - { "zoom", PLAYER_ZOOM, 0, 0 }, - { "loogiex", PLAYER_LOOGIEX, LABEL_HASPARM2, 64 }, - { "loogiey", PLAYER_LOOGIEY, LABEL_HASPARM2, 64 }, - { "numloogs", PLAYER_NUMLOOGS, 0, 0 }, - { "loogcnt", PLAYER_LOOGCNT, 0, 0 }, - { "posx", PLAYER_POSX, 0, 0 }, - { "posy", PLAYER_POSY, 0, 0 }, - { "posz", PLAYER_POSZ, 0, 0 }, - { "horiz", PLAYER_HORIZ, 0, 0 }, - { "ohoriz", PLAYER_OHORIZ, 0, 0 }, - { "ohorizoff", PLAYER_OHORIZOFF, 0, 0 }, - { "invdisptime", PLAYER_INVDISPTIME, 0, 0 }, - { "bobposx", PLAYER_BOBPOSX, 0, 0 }, - { "bobposy", PLAYER_BOBPOSY, 0, 0 }, - { "oposx", PLAYER_OPOSX, 0, 0 }, - { "oposy", PLAYER_OPOSY, 0, 0 }, - { "oposz", PLAYER_OPOSZ, 0, 0 }, - { "pyoff", PLAYER_PYOFF, 0, 0 }, - { "opyoff", PLAYER_OPYOFF, 0, 0 }, - { "posxv", PLAYER_POSXV, 0, 0 }, - { "posyv", PLAYER_POSYV, 0, 0 }, - { "poszv", PLAYER_POSZV, 0, 0 }, - { "last_pissed_time", PLAYER_LAST_PISSED_TIME, 0, 0 }, - { "truefz", PLAYER_TRUEFZ, 0, 0 }, - { "truecz", PLAYER_TRUECZ, 0, 0 }, - { "player_par", PLAYER_PLAYER_PAR, 0, 0 }, - { "visibility", PLAYER_VISIBILITY, 0, 0 }, - { "bobcounter", PLAYER_BOBCOUNTER, 0, 0 }, - { "weapon_sway", PLAYER_WEAPON_SWAY, 0, 0 }, - { "pals_time", PLAYER_PALS_TIME, 0, 0 }, - { "crack_time", PLAYER_CRACK_TIME, 0, 0 }, - { "aim_mode", PLAYER_AIM_MODE, 0, 0 }, - { "ang", PLAYER_ANG, 0, 0 }, - { "oang", PLAYER_OANG, 0, 0 }, - { "angvel", PLAYER_ANGVEL, 0, 0 }, - { "cursectnum", PLAYER_CURSECTNUM, 0, 0 }, - { "look_ang", PLAYER_LOOK_ANG, 0, 0 }, - { "last_extra", PLAYER_LAST_EXTRA, 0, 0 }, - { "subweapon", PLAYER_SUBWEAPON, 0, 0 }, - { "ammo_amount", PLAYER_AMMO_AMOUNT, LABEL_HASPARM2, MAX_WEAPONS }, - { "wackedbyactor", PLAYER_WACKEDBYACTOR, 0, 0 }, - { "frag", PLAYER_FRAG, 0, 0 }, - { "fraggedself", PLAYER_FRAGGEDSELF, 0, 0 }, - { "curr_weapon", PLAYER_CURR_WEAPON, 0, 0 }, - { "last_weapon", PLAYER_LAST_WEAPON, 0, 0 }, - { "tipincs", PLAYER_TIPINCS, 0, 0 }, - { "horizoff", PLAYER_HORIZOFF, 0, 0 }, - { "wantweaponfire", PLAYER_WANTWEAPONFIRE, 0, 0 }, - { "holoduke_amount", PLAYER_HOLODUKE_AMOUNT, 0, 0 }, - { "newowner", PLAYER_NEWOWNER, 0, 0 }, - { "hurt_delay", PLAYER_HURT_DELAY, 0, 0 }, - { "hbomb_hold_delay", PLAYER_HBOMB_HOLD_DELAY, 0, 0 }, - { "jumping_counter", PLAYER_JUMPING_COUNTER, 0, 0 }, - { "airleft", PLAYER_AIRLEFT, 0, 0 }, - { "knee_incs", PLAYER_KNEE_INCS, 0, 0 }, - { "access_incs", PLAYER_ACCESS_INCS, 0, 0 }, - { "fta", PLAYER_FTA, 0, 0 }, - { "ftq", PLAYER_FTQ, 0, 0 }, - { "access_wallnum", PLAYER_ACCESS_WALLNUM, 0, 0 }, - { "access_spritenum", PLAYER_ACCESS_SPRITENUM, 0, 0 }, - { "kickback_pic", PLAYER_KICKBACK_PIC, 0, 0 }, - { "got_access", PLAYER_GOT_ACCESS, 0, 0 }, - { "weapon_ang", PLAYER_WEAPON_ANG, 0, 0 }, - { "firstaid_amount", PLAYER_FIRSTAID_AMOUNT, 0, 0 }, - { "somethingonplayer", PLAYER_SOMETHINGONPLAYER, 0, 0 }, - { "on_crane", PLAYER_ON_CRANE, 0, 0 }, - { "i", PLAYER_I, 0, 0 }, - { "one_parallax_sectnum", PLAYER_PARALLAX_SECTNUM, 0, 0 }, - { "over_shoulder_on", PLAYER_OVER_SHOULDER_ON, 0, 0 }, - { "random_club_frame", PLAYER_RANDOM_CLUB_FRAME, 0, 0 }, - { "fist_incs", PLAYER_FIST_INCS, 0, 0 }, - { "one_eighty_count", PLAYER_ONE_EIGHTY_COUNT, 0, 0 }, - { "cheat_phase", PLAYER_CHEAT_PHASE, 0, 0 }, - { "dummyplayersprite", PLAYER_DUMMYPLAYERSPRITE, 0, 0 }, - { "extra_extra8", PLAYER_EXTRA_EXTRA8, 0, 0 }, - { "quick_kick", PLAYER_QUICK_KICK, 0, 0 }, - { "heat_amount", PLAYER_HEAT_AMOUNT, 0, 0 }, - { "actorsqu", PLAYER_ACTORSQU, 0, 0 }, - { "timebeforeexit", PLAYER_TIMEBEFOREEXIT, 0, 0 }, - { "customexitsound", PLAYER_CUSTOMEXITSOUND, 0, 0 }, - { "weaprecs", PLAYER_WEAPRECS, LABEL_HASPARM2, MAX_WEAPONS }, - { "weapreccnt", PLAYER_WEAPRECCNT, 0, 0 }, - { "interface_toggle_flag", PLAYER_INTERFACE_TOGGLE, 0, 0 }, - { "rotscrnang", PLAYER_ROTSCRNANG, 0, 0 }, - { "dead_flag", PLAYER_DEAD_FLAG, 0, 0 }, - { "show_empty_weapon", PLAYER_SHOW_EMPTY_WEAPON, 0, 0 }, - { "scuba_amount", PLAYER_SCUBA_AMOUNT, 0, 0 }, - { "jetpack_amount", PLAYER_JETPACK_AMOUNT, 0, 0 }, - { "steroids_amount", PLAYER_STEROIDS_AMOUNT, 0, 0 }, - { "shield_amount", PLAYER_SHIELD_AMOUNT, 0, 0 }, - { "holoduke_on", PLAYER_HOLODUKE_ON, 0, 0 }, - { "pycount", PLAYER_PYCOUNT, 0, 0 }, - { "weapon_pos", PLAYER_WEAPON_POS, 0, 0 }, - { "frag_ps", PLAYER_FRAG_PS, 0, 0 }, - { "transporter_hold", PLAYER_TRANSPORTER_HOLD, 0, 0 }, - { "clipdist", PLAYER_CLIPDIST, 0, 0 }, - { "last_full_weapon", PLAYER_LAST_FULL_WEAPON, 0, 0 }, - { "footprintshade", PLAYER_FOOTPRINTSHADE, 0, 0 }, - { "boot_amount", PLAYER_BOOT_AMOUNT, 0, 0 }, - { "scream_voice", PLAYER_SCREAM_VOICE, 0, 0 }, - { "gm", PLAYER_GM, 0, 0 }, - { "on_warping_sector", PLAYER_ON_WARPING_SECTOR, 0, 0 }, - { "footprintcount", PLAYER_FOOTPRINTCOUNT, 0, 0 }, - { "hbomb_on", PLAYER_HBOMB_ON, 0, 0 }, - { "jumping_toggle", PLAYER_JUMPING_TOGGLE, 0, 0 }, - { "rapid_fire_hold", PLAYER_RAPID_FIRE_HOLD, 0, 0 }, - { "on_ground", PLAYER_ON_GROUND, 0, 0 }, - { "name", PLAYER_NAME, LABEL_ISSTRING, 32 }, - { "inven_icon", PLAYER_INVEN_ICON, 0, 0 }, - { "buttonpalette", PLAYER_BUTTONPALETTE, 0, 0 }, - { "jetpack_on", PLAYER_JETPACK_ON, 0, 0 }, - { "spritebridge", PLAYER_SPRITEBRIDGE, 0, 0 }, - { "scuba_on", PLAYER_SCUBA_ON, 0, 0 }, - { "footprintpal", PLAYER_FOOTPRINTPAL, 0, 0 }, - { "heat_on", PLAYER_HEAT_ON, 0, 0 }, - { "holster_weapon", PLAYER_HOLSTER_WEAPON, 0, 0 }, - { "falling_counter", PLAYER_FALLING_COUNTER, 0, 0 }, - { "gotweapon", PLAYER_GOTWEAPON, LABEL_HASPARM2, MAX_WEAPONS }, - { "palette", PLAYER_PALETTE, 0, 0 }, - { "toggle_key_flag", PLAYER_TOGGLE_KEY_FLAG, 0, 0 }, - { "knuckle_incs", PLAYER_KNUCKLE_INCS, 0, 0 }, - { "walking_snd_toggle", PLAYER_WALKING_SND_TOGGLE, 0, 0 }, - { "palookup", PLAYER_PALOOKUP, 0, 0 }, - { "hard_landing", PLAYER_HARD_LANDING, 0, 0 }, - { "max_secret_rooms", PLAYER_MAX_SECRET_ROOMS, 0, 0 }, - { "secret_rooms", PLAYER_SECRET_ROOMS, 0, 0 }, - { "pals", PLAYER_PALS, LABEL_HASPARM2, 3 }, - { "max_actors_killed", PLAYER_MAX_ACTORS_KILLED, 0, 0 }, - { "actors_killed", PLAYER_ACTORS_KILLED, 0, 0 }, - { "return_to_center", PLAYER_RETURN_TO_CENTER, 0, 0 }, - { "runspeed", PLAYER_RUNSPEED, 0, 0 }, - { "sbs", PLAYER_SBS, 0, 0 }, - { "reloading", PLAYER_RELOADING, 0, 0 }, - { "auto_aim", PLAYER_AUTO_AIM, 0, 0 }, - { "movement_lock", PLAYER_MOVEMENT_LOCK, 0, 0 }, - { "sound_pitch", PLAYER_SOUND_PITCH, 0, 0 }, - { "weaponswitch", PLAYER_WEAPONSWITCH, 0, 0 }, - { "team", PLAYER_TEAM, 0, 0 }, - { "max_player_health", PLAYER_MAX_PLAYER_HEALTH, 0, 0 }, - { "max_shield_amount", PLAYER_MAX_SHIELD_AMOUNT, 0, 0 }, - { "max_ammo_amount", PLAYER_MAX_AMMO_AMOUNT, LABEL_HASPARM2, MAX_WEAPONS }, - { "last_quick_kick", PLAYER_LAST_QUICK_KICK, 0, 0 }, - { "autostep", PLAYER_AUTOSTEP, 0, 0 }, - { "autostep_sbw", PLAYER_AUTOSTEP_SBW, 0, 0 }, - { "hudpal", PLAYER_HUDPAL, 0, 0 }, - { "index", PLAYER_INDEX, 0, 0 }, - { "connected", PLAYER_CONNECTED, 0, 0 }, - { "frags", PLAYER_FRAGS, LABEL_HASPARM2, MAXPLAYERS }, - { "deaths", PLAYER_DEATHS, 0, 0 }, - { "last_used_weapon", PLAYER_LAST_USED_WEAPON, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + { "zoom", PLAYER_ZOOM, 0, 0, -1 }, + { "loogiex", PLAYER_LOOGIEX, LABEL_HASPARM2, 64, -1 }, + { "loogiey", PLAYER_LOOGIEY, LABEL_HASPARM2, 64, -1 }, + { "numloogs", PLAYER_NUMLOOGS, 0, 0, -1 }, + { "loogcnt", PLAYER_LOOGCNT, 0, 0, -1 }, + { "posx", PLAYER_POSX, 0, 0, -1 }, + { "posy", PLAYER_POSY, 0, 0, -1 }, + { "posz", PLAYER_POSZ, 0, 0, -1 }, + { "horiz", PLAYER_HORIZ, 0, 0, -1 }, + { "ohoriz", PLAYER_OHORIZ, 0, 0, -1 }, + { "ohorizoff", PLAYER_OHORIZOFF, 0, 0, -1 }, + { "invdisptime", PLAYER_INVDISPTIME, 0, 0, -1 }, + { "bobposx", PLAYER_BOBPOSX, 0, 0, -1 }, + { "bobposy", PLAYER_BOBPOSY, 0, 0, -1 }, + { "oposx", PLAYER_OPOSX, 0, 0, -1 }, + { "oposy", PLAYER_OPOSY, 0, 0, -1 }, + { "oposz", PLAYER_OPOSZ, 0, 0, -1 }, + { "pyoff", PLAYER_PYOFF, 0, 0, -1 }, + { "opyoff", PLAYER_OPYOFF, 0, 0, -1 }, + { "posxv", PLAYER_POSXV, 0, 0, -1 }, + { "posyv", PLAYER_POSYV, 0, 0, -1 }, + { "poszv", PLAYER_POSZV, 0, 0, -1 }, + { "last_pissed_time", PLAYER_LAST_PISSED_TIME, 0, 0, -1 }, + { "truefz", PLAYER_TRUEFZ, 0, 0, -1 }, + { "truecz", PLAYER_TRUECZ, 0, 0, -1 }, + { "player_par", PLAYER_PLAYER_PAR, 0, 0, -1 }, + { "visibility", PLAYER_VISIBILITY, 0, 0, -1 }, + { "bobcounter", PLAYER_BOBCOUNTER, 0, 0, -1 }, + { "weapon_sway", PLAYER_WEAPON_SWAY, 0, 0, -1 }, + { "pals_time", PLAYER_PALS_TIME, 0, 0, -1 }, + { "crack_time", PLAYER_CRACK_TIME, 0, 0, -1 }, + { "aim_mode", PLAYER_AIM_MODE, 0, 0, -1 }, + { "ang", PLAYER_ANG, 0, 0, -1 }, + { "oang", PLAYER_OANG, 0, 0, -1 }, + { "angvel", PLAYER_ANGVEL, 0, 0, -1 }, + { "cursectnum", PLAYER_CURSECTNUM, 0, 0, -1 }, + { "look_ang", PLAYER_LOOK_ANG, 0, 0, -1 }, + { "last_extra", PLAYER_LAST_EXTRA, 0, 0, -1 }, + { "subweapon", PLAYER_SUBWEAPON, 0, 0, -1 }, + { "ammo_amount", PLAYER_AMMO_AMOUNT, LABEL_HASPARM2, MAX_WEAPONS, -1 }, + { "wackedbyactor", PLAYER_WACKEDBYACTOR, 0, 0, -1 }, + { "frag", PLAYER_FRAG, 0, 0, -1 }, + { "fraggedself", PLAYER_FRAGGEDSELF, 0, 0, -1 }, + { "curr_weapon", PLAYER_CURR_WEAPON, 0, 0, -1 }, + { "last_weapon", PLAYER_LAST_WEAPON, 0, 0, -1 }, + { "tipincs", PLAYER_TIPINCS, 0, 0, -1 }, + { "horizoff", PLAYER_HORIZOFF, 0, 0, -1 }, + { "wantweaponfire", PLAYER_WANTWEAPONFIRE, 0, 0, -1 }, + { "holoduke_amount", PLAYER_HOLODUKE_AMOUNT, 0, 0, -1 }, + { "newowner", PLAYER_NEWOWNER, 0, 0, -1 }, + { "hurt_delay", PLAYER_HURT_DELAY, 0, 0, -1 }, + { "hbomb_hold_delay", PLAYER_HBOMB_HOLD_DELAY, 0, 0, -1 }, + { "jumping_counter", PLAYER_JUMPING_COUNTER, 0, 0, -1 }, + { "airleft", PLAYER_AIRLEFT, 0, 0, -1 }, + { "knee_incs", PLAYER_KNEE_INCS, 0, 0, -1 }, + { "access_incs", PLAYER_ACCESS_INCS, 0, 0, -1 }, + { "fta", PLAYER_FTA, 0, 0, -1 }, + { "ftq", PLAYER_FTQ, 0, 0, -1 }, + { "access_wallnum", PLAYER_ACCESS_WALLNUM, 0, 0, -1 }, + { "access_spritenum", PLAYER_ACCESS_SPRITENUM, 0, 0, -1 }, + { "kickback_pic", PLAYER_KICKBACK_PIC, 0, 0, -1 }, + { "got_access", PLAYER_GOT_ACCESS, 0, 0, -1 }, + { "weapon_ang", PLAYER_WEAPON_ANG, 0, 0, -1 }, + { "firstaid_amount", PLAYER_FIRSTAID_AMOUNT, 0, 0, -1 }, + { "somethingonplayer", PLAYER_SOMETHINGONPLAYER, 0, 0, -1 }, + { "on_crane", PLAYER_ON_CRANE, 0, 0, -1 }, + { "i", PLAYER_I, 0, 0, -1 }, + { "one_parallax_sectnum", PLAYER_PARALLAX_SECTNUM, 0, 0, -1 }, + { "over_shoulder_on", PLAYER_OVER_SHOULDER_ON, 0, 0, -1 }, + { "random_club_frame", PLAYER_RANDOM_CLUB_FRAME, 0, 0, -1 }, + { "fist_incs", PLAYER_FIST_INCS, 0, 0, -1 }, + { "one_eighty_count", PLAYER_ONE_EIGHTY_COUNT, 0, 0, -1 }, + { "cheat_phase", PLAYER_CHEAT_PHASE, 0, 0, -1 }, + { "dummyplayersprite", PLAYER_DUMMYPLAYERSPRITE, 0, 0, -1 }, + { "extra_extra8", PLAYER_EXTRA_EXTRA8, 0, 0, -1 }, + { "quick_kick", PLAYER_QUICK_KICK, 0, 0, -1 }, + { "heat_amount", PLAYER_HEAT_AMOUNT, 0, 0, -1 }, + { "actorsqu", PLAYER_ACTORSQU, 0, 0, -1 }, + { "timebeforeexit", PLAYER_TIMEBEFOREEXIT, 0, 0, -1 }, + { "customexitsound", PLAYER_CUSTOMEXITSOUND, 0, 0, -1 }, + { "weaprecs", PLAYER_WEAPRECS, LABEL_HASPARM2, MAX_WEAPONS, -1 }, + { "weapreccnt", PLAYER_WEAPRECCNT, 0, 0, -1 }, + { "interface_toggle_flag", PLAYER_INTERFACE_TOGGLE, 0, 0, -1 }, + { "rotscrnang", PLAYER_ROTSCRNANG, 0, 0, -1 }, + { "dead_flag", PLAYER_DEAD_FLAG, 0, 0, -1 }, + { "show_empty_weapon", PLAYER_SHOW_EMPTY_WEAPON, 0, 0, -1 }, + { "scuba_amount", PLAYER_SCUBA_AMOUNT, 0, 0, -1 }, + { "jetpack_amount", PLAYER_JETPACK_AMOUNT, 0, 0, -1 }, + { "steroids_amount", PLAYER_STEROIDS_AMOUNT, 0, 0, -1 }, + { "shield_amount", PLAYER_SHIELD_AMOUNT, 0, 0, -1 }, + { "holoduke_on", PLAYER_HOLODUKE_ON, 0, 0, -1 }, + { "pycount", PLAYER_PYCOUNT, 0, 0, -1 }, + { "weapon_pos", PLAYER_WEAPON_POS, 0, 0, -1 }, + { "frag_ps", PLAYER_FRAG_PS, 0, 0, -1 }, + { "transporter_hold", PLAYER_TRANSPORTER_HOLD, 0, 0, -1 }, + { "clipdist", PLAYER_CLIPDIST, 0, 0, -1 }, + { "last_full_weapon", PLAYER_LAST_FULL_WEAPON, 0, 0, -1 }, + { "footprintshade", PLAYER_FOOTPRINTSHADE, 0, 0, -1 }, + { "boot_amount", PLAYER_BOOT_AMOUNT, 0, 0, -1 }, + { "scream_voice", PLAYER_SCREAM_VOICE, 0, 0, -1 }, + { "gm", PLAYER_GM, 0, 0, -1 }, + { "on_warping_sector", PLAYER_ON_WARPING_SECTOR, 0, 0, -1 }, + { "footprintcount", PLAYER_FOOTPRINTCOUNT, 0, 0, -1 }, + { "hbomb_on", PLAYER_HBOMB_ON, 0, 0, -1 }, + { "jumping_toggle", PLAYER_JUMPING_TOGGLE, 0, 0, -1 }, + { "rapid_fire_hold", PLAYER_RAPID_FIRE_HOLD, 0, 0, -1 }, + { "on_ground", PLAYER_ON_GROUND, 0, 0, -1 }, + { "name", PLAYER_NAME, LABEL_ISSTRING, 32, -1 }, + { "inven_icon", PLAYER_INVEN_ICON, 0, 0, -1 }, + { "buttonpalette", PLAYER_BUTTONPALETTE, 0, 0, -1 }, + { "jetpack_on", PLAYER_JETPACK_ON, 0, 0, -1 }, + { "spritebridge", PLAYER_SPRITEBRIDGE, 0, 0, -1 }, + { "scuba_on", PLAYER_SCUBA_ON, 0, 0, -1 }, + { "footprintpal", PLAYER_FOOTPRINTPAL, 0, 0, -1 }, + { "heat_on", PLAYER_HEAT_ON, 0, 0, -1 }, + { "holster_weapon", PLAYER_HOLSTER_WEAPON, 0, 0, -1 }, + { "falling_counter", PLAYER_FALLING_COUNTER, 0, 0, -1 }, + { "gotweapon", PLAYER_GOTWEAPON, LABEL_HASPARM2, MAX_WEAPONS, -1 }, + { "palette", PLAYER_PALETTE, 0, 0, -1 }, + { "toggle_key_flag", PLAYER_TOGGLE_KEY_FLAG, 0, 0, -1 }, + { "knuckle_incs", PLAYER_KNUCKLE_INCS, 0, 0, -1 }, + { "walking_snd_toggle", PLAYER_WALKING_SND_TOGGLE, 0, 0, -1 }, + { "palookup", PLAYER_PALOOKUP, 0, 0, -1 }, + { "hard_landing", PLAYER_HARD_LANDING, 0, 0, -1 }, + { "max_secret_rooms", PLAYER_MAX_SECRET_ROOMS, 0, 0, -1 }, + { "secret_rooms", PLAYER_SECRET_ROOMS, 0, 0, -1 }, + { "pals", PLAYER_PALS, LABEL_HASPARM2, 3, -1 }, + { "max_actors_killed", PLAYER_MAX_ACTORS_KILLED, 0, 0, -1 }, + { "actors_killed", PLAYER_ACTORS_KILLED, 0, 0, -1 }, + { "return_to_center", PLAYER_RETURN_TO_CENTER, 0, 0, -1 }, + { "runspeed", PLAYER_RUNSPEED, 0, 0, -1 }, + { "sbs", PLAYER_SBS, 0, 0, -1 }, + { "reloading", PLAYER_RELOADING, 0, 0, -1 }, + { "auto_aim", PLAYER_AUTO_AIM, 0, 0, -1 }, + { "movement_lock", PLAYER_MOVEMENT_LOCK, 0, 0, -1 }, + { "sound_pitch", PLAYER_SOUND_PITCH, 0, 0, -1 }, + { "weaponswitch", PLAYER_WEAPONSWITCH, 0, 0, -1 }, + { "team", PLAYER_TEAM, 0, 0, -1 }, + { "max_player_health", PLAYER_MAX_PLAYER_HEALTH, 0, 0, -1 }, + { "max_shield_amount", PLAYER_MAX_SHIELD_AMOUNT, 0, 0, -1 }, + { "max_ammo_amount", PLAYER_MAX_AMMO_AMOUNT, LABEL_HASPARM2, MAX_WEAPONS, -1 }, + { "last_quick_kick", PLAYER_LAST_QUICK_KICK, 0, 0, -1 }, + { "autostep", PLAYER_AUTOSTEP, 0, 0, -1 }, + { "autostep_sbw", PLAYER_AUTOSTEP_SBW, 0, 0, -1 }, + { "hudpal", PLAYER_HUDPAL, 0, 0, -1 }, + { "index", PLAYER_INDEX, 0, 0, -1 }, + { "connected", PLAYER_CONNECTED, 0, 0, -1 }, + { "frags", PLAYER_FRAGS, LABEL_HASPARM2, MAXPLAYERS, -1 }, + { "deaths", PLAYER_DEATHS, 0, 0, -1 }, + { "last_used_weapon", PLAYER_LAST_USED_WEAPON, 0, 0, -1 }, }; const memberlabel_t ProjectileLabels[]= { - { "workslike", PROJ_WORKSLIKE, 0, 0 }, - { "spawns", PROJ_SPAWNS, 0, 0 }, - { "sxrepeat", PROJ_SXREPEAT, 0, 0 }, - { "syrepeat", PROJ_SYREPEAT, 0, 0 }, - { "sound", PROJ_SOUND, 0, 0 }, - { "isound", PROJ_ISOUND, 0, 0 }, - { "vel", PROJ_VEL, 0, 0 }, - { "extra", PROJ_EXTRA, 0, 0 }, - { "decal", PROJ_DECAL, 0, 0 }, - { "trail", PROJ_TRAIL, 0, 0 }, - { "txrepeat", PROJ_TXREPEAT, 0, 0 }, - { "tyrepeat", PROJ_TYREPEAT, 0, 0 }, - { "toffset", PROJ_TOFFSET, 0, 0 }, - { "tnum", PROJ_TNUM, 0, 0 }, - { "drop", PROJ_DROP, 0, 0 }, - { "cstat", PROJ_CSTAT, 0, 0 }, - { "clipdist", PROJ_CLIPDIST, 0, 0 }, - { "shade", PROJ_SHADE, 0, 0 }, - { "xrepeat", PROJ_XREPEAT, 0, 0 }, - { "yrepeat", PROJ_YREPEAT, 0, 0 }, - { "pal", PROJ_PAL, 0, 0 }, - { "extra_rand", PROJ_EXTRA_RAND, 0, 0 }, - { "hitradius", PROJ_HITRADIUS, 0, 0 }, - { "velmult", PROJ_MOVECNT, 0, 0 }, - { "offset", PROJ_OFFSET, 0, 0 }, - { "bounces", PROJ_BOUNCES, 0, 0 }, - { "bsound", PROJ_BSOUND, 0, 0 }, - { "range", PROJ_RANGE, 0, 0 }, - { "flashcolor", PROJ_FLASH_COLOR, 0, 0 }, - { "userdata", PROJ_USERDATA, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + { "workslike", PROJ_WORKSLIKE, 0, 0, -1 }, + { "spawns", PROJ_SPAWNS, 0, 0, -1 }, + { "sxrepeat", PROJ_SXREPEAT, 0, 0, -1 }, + { "syrepeat", PROJ_SYREPEAT, 0, 0, -1 }, + { "sound", PROJ_SOUND, 0, 0, -1 }, + { "isound", PROJ_ISOUND, 0, 0, -1 }, + { "vel", PROJ_VEL, 0, 0, -1 }, + { "extra", PROJ_EXTRA, 0, 0, -1 }, + { "decal", PROJ_DECAL, 0, 0, -1 }, + { "trail", PROJ_TRAIL, 0, 0, -1 }, + { "txrepeat", PROJ_TXREPEAT, 0, 0, -1 }, + { "tyrepeat", PROJ_TYREPEAT, 0, 0, -1 }, + { "toffset", PROJ_TOFFSET, 0, 0, -1 }, + { "tnum", PROJ_TNUM, 0, 0, -1 }, + { "drop", PROJ_DROP, 0, 0, -1 }, + { "cstat", PROJ_CSTAT, 0, 0, -1 }, + { "clipdist", PROJ_CLIPDIST, 0, 0, -1 }, + { "shade", PROJ_SHADE, 0, 0, -1 }, + { "xrepeat", PROJ_XREPEAT, 0, 0, -1 }, + { "yrepeat", PROJ_YREPEAT, 0, 0, -1 }, + { "pal", PROJ_PAL, 0, 0, -1 }, + { "extra_rand", PROJ_EXTRA_RAND, 0, 0, -1 }, + { "hitradius", PROJ_HITRADIUS, 0, 0, -1 }, + { "velmult", PROJ_MOVECNT, 0, 0, -1 }, + { "offset", PROJ_OFFSET, 0, 0, -1 }, + { "bounces", PROJ_BOUNCES, 0, 0, -1 }, + { "bsound", PROJ_BSOUND, 0, 0, -1 }, + { "range", PROJ_RANGE, 0, 0, -1 }, + { "flashcolor", PROJ_FLASH_COLOR, 0, 0, -1 }, + { "userdata", PROJ_USERDATA, 0, 0, -1 }, }; const memberlabel_t UserdefsLabels[]= { - // { "", 1, 0, 0 }, - { "god", USERDEFS_GOD, 0, 0 }, - { "warp_on", USERDEFS_WARP_ON, 0, 0 }, - { "cashman", USERDEFS_CASHMAN, 0, 0 }, - { "eog", USERDEFS_EOG, 0, 0 }, - { "showallmap", USERDEFS_SHOWALLMAP, 0, 0 }, - { "show_help", USERDEFS_SHOW_HELP, 0, 0 }, - { "scrollmode", USERDEFS_SCROLLMODE, 0, 0 }, - { "clipping", USERDEFS_CLIPPING, 0, 0 }, - { "user_name", USERDEFS_USER_NAME, LABEL_HASPARM2, MAXPLAYERS }, - { "ridecule", USERDEFS_RIDECULE, LABEL_HASPARM2 | LABEL_ISSTRING, 10 }, - { "savegame", USERDEFS_SAVEGAME, LABEL_HASPARM2 | LABEL_ISSTRING, 10 }, - { "pwlockout", USERDEFS_PWLOCKOUT, LABEL_ISSTRING, 128 }, - { "rtsname;", USERDEFS_RTSNAME, LABEL_ISSTRING, 128 }, - { "overhead_on", USERDEFS_OVERHEAD_ON, 0, 0 }, - { "last_overhead", USERDEFS_LAST_OVERHEAD, 0, 0 }, - { "showweapons", USERDEFS_SHOWWEAPONS, 0, 0 }, - { "pause_on", USERDEFS_PAUSE_ON, 0, 0 }, - { "from_bonus", USERDEFS_FROM_BONUS, 0, 0 }, - { "camerasprite", USERDEFS_CAMERASPRITE, 0, 0 }, - { "last_camsprite", USERDEFS_LAST_CAMSPRITE, 0, 0 }, - { "last_level", USERDEFS_LAST_LEVEL, 0, 0 }, - { "secretlevel", USERDEFS_SECRETLEVEL, 0, 0 }, - { "const_visibility", USERDEFS_CONST_VISIBILITY, 0, 0 }, - { "uw_framerate", USERDEFS_UW_FRAMERATE, 0, 0 }, - { "camera_time", USERDEFS_CAMERA_TIME, 0, 0 }, - { "folfvel", USERDEFS_FOLFVEL, 0, 0 }, - { "folavel", USERDEFS_FOLAVEL, 0, 0 }, - { "folx", USERDEFS_FOLX, 0, 0 }, - { "foly", USERDEFS_FOLY, 0, 0 }, - { "fola", USERDEFS_FOLA, 0, 0 }, - { "reccnt", USERDEFS_RECCNT, 0, 0 }, - { "entered_name", USERDEFS_ENTERED_NAME, 0, 0 }, - { "screen_tilting", USERDEFS_SCREEN_TILTING, 0, 0 }, - { "shadows", USERDEFS_SHADOWS, 0, 0 }, - { "fta_on", USERDEFS_FTA_ON, 0, 0 }, - { "executions", USERDEFS_EXECUTIONS, 0, 0 }, - { "auto_run", USERDEFS_AUTO_RUN, 0, 0 }, - { "coords", USERDEFS_COORDS, 0, 0 }, - { "tickrate", USERDEFS_TICKRATE, 0, 0 }, - { "m_coop", USERDEFS_M_COOP, 0, 0 }, - { "coop", USERDEFS_COOP, 0, 0 }, - { "screen_size", USERDEFS_SCREEN_SIZE, 0, 0 }, - { "lockout", USERDEFS_LOCKOUT, 0, 0 }, - { "crosshair", USERDEFS_CROSSHAIR, 0, 0 }, - { "playerai", USERDEFS_PLAYERAI, 0, 0 }, - { "respawn_monsters", USERDEFS_RESPAWN_MONSTERS, 0, 0 }, - { "respawn_items", USERDEFS_RESPAWN_ITEMS, 0, 0 }, - { "respawn_inventory", USERDEFS_RESPAWN_INVENTORY, 0, 0 }, - { "recstat", USERDEFS_RECSTAT, 0, 0 }, - { "monsters_off", USERDEFS_MONSTERS_OFF, 0, 0 }, - { "brightness", USERDEFS_BRIGHTNESS, 0, 0 }, - { "m_respawn_items", USERDEFS_M_RESPAWN_ITEMS, 0, 0 }, - { "m_respawn_monsters", USERDEFS_M_RESPAWN_MONSTERS, 0, 0 }, - { "m_respawn_inventory", USERDEFS_M_RESPAWN_INVENTORY, 0, 0 }, - { "m_recstat", USERDEFS_M_RECSTAT, 0, 0 }, - { "m_monsters_off", USERDEFS_M_MONSTERS_OFF, 0, 0 }, - { "detail", USERDEFS_DETAIL, 0, 0 }, - { "m_ffire", USERDEFS_M_FFIRE, 0, 0 }, - { "ffire", USERDEFS_FFIRE, 0, 0 }, - { "m_player_skill", USERDEFS_M_PLAYER_SKILL, 0, 0 }, - { "m_level_number", USERDEFS_M_LEVEL_NUMBER, 0, 0 }, - { "m_volume_number", USERDEFS_M_VOLUME_NUMBER, 0, 0 }, - { "multimode", USERDEFS_MULTIMODE, 0, 0 }, - { "player_skill", USERDEFS_PLAYER_SKILL, 0, 0 }, - { "level_number", USERDEFS_LEVEL_NUMBER, 0, 0 }, - { "volume_number", USERDEFS_VOLUME_NUMBER, 0, 0 }, - { "m_marker", USERDEFS_M_MARKER, 0, 0 }, - { "marker", USERDEFS_MARKER, 0, 0 }, - { "mouseflip", USERDEFS_MOUSEFLIP, 0, 0 }, - { "statusbarscale", USERDEFS_STATUSBARSCALE, 0, 0 }, - { "drawweapon", USERDEFS_DRAWWEAPON, 0, 0 }, - { "mouseaiming", USERDEFS_MOUSEAIMING, 0, 0 }, - { "weaponswitch", USERDEFS_WEAPONSWITCH, 0, 0 }, - { "democams", USERDEFS_DEMOCAMS, 0, 0 }, - { "color", USERDEFS_COLOR, 0, 0 }, - { "msgdisptime", USERDEFS_MSGDISPTIME, 0, 0 }, - { "statusbarmode", USERDEFS_STATUSBARMODE, 0, 0 }, - { "m_noexits", USERDEFS_M_NOEXITS, 0, 0 }, - { "noexits", USERDEFS_NOEXITS, 0, 0 }, - { "autovote", USERDEFS_AUTOVOTE, 0, 0 }, - { "automsg", USERDEFS_AUTOMSG, 0, 0 }, - { "idplayers", USERDEFS_IDPLAYERS, 0, 0 }, - { "team", USERDEFS_TEAM, 0, 0 }, - { "viewbob", USERDEFS_VIEWBOB, 0, 0 }, - { "weaponsway", USERDEFS_WEAPONSWAY, 0, 0 }, - { "angleinterpolation", USERDEFS_ANGLEINTERPOLATION, 0, 0 }, - { "obituaries", USERDEFS_OBITUARIES, 0, 0 }, - { "levelstats", USERDEFS_LEVELSTATS, 0, 0 }, - { "crosshairscale", USERDEFS_CROSSHAIRSCALE, 0, 0 }, - { "althud", USERDEFS_ALTHUD, 0, 0 }, - { "display_bonus_screen", USERDEFS_DISPLAY_BONUS_SCREEN, 0, 0 }, - { "show_level_text", USERDEFS_SHOW_LEVEL_TEXT, 0, 0 }, - { "weaponscale", USERDEFS_WEAPONSCALE, 0, 0 }, - { "textscale", USERDEFS_TEXTSCALE, 0, 0 }, - { "runkey_mode", USERDEFS_RUNKEY_MODE, 0, 0 }, - { "m_origin_x", USERDEFS_M_ORIGIN_X, 0, 0 }, - { "m_origin_y", USERDEFS_M_ORIGIN_Y, 0, 0 }, - { "playerbest", USERDEFS_PLAYERBEST, 0, 0 }, - { "musictoggle", USERDEFS_MUSICTOGGLE, 0, 0 }, - { "usevoxels", USERDEFS_USEVOXELS, 0, 0 }, - { "usehightile", USERDEFS_USEHIGHTILE, 0, 0 }, - { "usemodels", USERDEFS_USEMODELS, 0, 0 }, - { "gametypeflags", USERDEFS_GAMETYPEFLAGS, 0, 0 }, - { "m_gametypeflags", USERDEFS_M_GAMETYPEFLAGS, 0, 0 }, - { "globalflags", USERDEFS_GLOBALFLAGS, 0, 0 }, - { "globalgameflags", USERDEFS_GLOBALGAMEFLAGS, 0, 0 }, - { "vm_player", USERDEFS_VM_PLAYER, 0, 0 }, - { "vm_sprite", USERDEFS_VM_SPRITE, 0, 0 }, - { "vm_distance", USERDEFS_VM_DISTANCE, 0, 0 }, - { "soundtoggle", USERDEFS_SOUNDTOGGLE, 0, 0 }, - { "gametext_tracking", USERDEFS_GAMETEXT_TRACKING, 0, 0 }, - { "mgametext_tracking", USERDEFS_MGAMETEXT_TRACKING, 0, 0 }, - { "menutext_tracking", USERDEFS_MENUTEXT_TRACKING, 0, 0 }, - { "maxspritesonscreen", USERDEFS_MAXSPRITESONSCREEN, 0, 0 }, - { "screenarea_x1", USERDEFS_SCREENAREA_X1, 0, 0 }, - { "screenarea_y1", USERDEFS_SCREENAREA_Y1, 0, 0 }, - { "screenarea_x2", USERDEFS_SCREENAREA_X2, 0, 0 }, - { "screenarea_y2", USERDEFS_SCREENAREA_Y2, 0, 0 }, - { "screenfade", USERDEFS_SCREENFADE, 0, 0 }, - { "menubackground", USERDEFS_MENUBACKGROUND, 0, 0 }, - { "statusbarflags", USERDEFS_STATUSBARFLAGS, 0, 0 }, - { "statusbarrange", USERDEFS_STATUSBARRANGE, 0, 0 }, - { "statusbarcustom", USERDEFS_STATUSBARCUSTOM, 0, 0 }, - { "hudontop", USERDEFS_HUDONTOP, 0, 0 }, - { "menu_slidebarz", USERDEFS_MENU_SLIDEBARZ, 0, 0 }, - { "menu_slidebarmargin", USERDEFS_MENU_SLIDEBARMARGIN, 0, 0 }, - { "menu_slidecursorz", USERDEFS_MENU_SLIDECURSORZ, 0, 0 }, - { "global_r", USERDEFS_GLOBAL_R, 0, 0 }, - { "global_g", USERDEFS_GLOBAL_G, 0, 0 }, - { "global_b", USERDEFS_GLOBAL_B, 0, 0 }, - { "default_volume", USERDEFS_DEFAULT_VOLUME, 0, 0 }, - { "default_skill", USERDEFS_DEFAULT_SKILL, 0, 0 }, - { "menu_shadedeselected", USERDEFS_MENU_SHADEDESELECTED, 0, 0 }, - { "menu_shadedisabled", USERDEFS_MENU_SHADEDISABLED, 0, 0 }, - { "menutext_zoom", USERDEFS_MENUTEXT_ZOOM, 0, 0 }, - { "menutext_xspace", USERDEFS_MENUTEXT_XSPACE, 0, 0 }, - { "menutext_pal", USERDEFS_MENUTEXT_PAL, 0, 0 }, - { "menutext_palselected", USERDEFS_MENUTEXT_PALSELECTED, 0, 0 }, - { "menutext_paldeselected", USERDEFS_MENUTEXT_PALDESELECTED, 0, 0 }, - { "menutext_paldisabled", USERDEFS_MENUTEXT_PALDISABLED, 0, 0 }, - { "menutext_palselected_right", USERDEFS_MENUTEXT_PALSELECTED_RIGHT, 0, 0 }, - { "menutext_paldeselected_right", USERDEFS_MENUTEXT_PALDESELECTED_RIGHT, 0, 0 }, - { "menutext_paldisabled_right", USERDEFS_MENUTEXT_PALDISABLED_RIGHT, 0, 0 }, - { "gametext_zoom", USERDEFS_GAMETEXT_ZOOM, 0, 0 }, - { "gametext_xspace", USERDEFS_GAMETEXT_XSPACE, 0, 0 }, - { "gametext_pal", USERDEFS_GAMETEXT_PAL, 0, 0 }, - { "gametext_palselected", USERDEFS_GAMETEXT_PALSELECTED, 0, 0 }, - { "gametext_paldeselected", USERDEFS_GAMETEXT_PALDESELECTED, 0, 0 }, - { "gametext_paldisabled", USERDEFS_GAMETEXT_PALDISABLED, 0, 0 }, - { "gametext_palselected_right", USERDEFS_GAMETEXT_PALSELECTED_RIGHT, 0, 0 }, - { "gametext_paldeselected_right", USERDEFS_GAMETEXT_PALDESELECTED_RIGHT, 0, 0 }, - { "gametext_paldisabled_right", USERDEFS_GAMETEXT_PALDISABLED_RIGHT, 0, 0 }, - { "minitext_zoom", USERDEFS_MINITEXT_ZOOM, 0, 0 }, - { "minitext_xspace", USERDEFS_MINITEXT_XSPACE, 0, 0 }, - { "minitext_tracking", USERDEFS_MINITEXT_TRACKING, 0, 0 }, - { "minitext_pal", USERDEFS_MINITEXT_PAL, 0, 0 }, - { "minitext_palselected", USERDEFS_MINITEXT_PALSELECTED, 0, 0 }, - { "minitext_paldeselected", USERDEFS_MINITEXT_PALDESELECTED, 0, 0 }, - { "minitext_paldisabled", USERDEFS_MINITEXT_PALDISABLED, 0, 0 }, - { "minitext_palselected_right", USERDEFS_MINITEXT_PALSELECTED_RIGHT, 0, 0 }, - { "minitext_paldeselected_right", USERDEFS_MINITEXT_PALDESELECTED_RIGHT, 0, 0 }, - { "minitext_paldisabled_right", USERDEFS_MINITEXT_PALDISABLED_RIGHT, 0, 0 }, - { "menutitle_pal", USERDEFS_MENUTITLE_PAL, 0, 0 }, - { "slidebar_palselected", USERDEFS_SLIDEBAR_PALSELECTED, 0, 0 }, - { "slidebar_paldisabled", USERDEFS_SLIDEBAR_PALDISABLED, 0, 0 }, - { "user_map", USERDEFS_USER_MAP, 0, 0 }, - { "m_user_map", USERDEFS_M_USER_MAP, 0, 0 }, - { "music_episode", USERDEFS_MUSIC_EPISODE, 0, 0 }, - { "music_level", USERDEFS_MUSIC_LEVEL, 0, 0 }, - { "shadow_pal", USERDEFS_SHADOW_PAL, 0, 0 }, - { "menu_scrollbartilenum", USERDEFS_MENU_SCROLLBARTILENUM, 0, 0 }, - { "menu_scrollbarz", USERDEFS_MENU_SCROLLBARZ, 0, 0 }, - { "menu_scrollcursorz", USERDEFS_MENU_SCROLLCURSORZ, 0, 0 }, - { "return", USERDEFS_RETURN, LABEL_HASPARM2, MAX_RETURN_VALUES }, - { "userbyteversion", USERDEFS_USERBYTEVERSION, 0, 0 }, - { "autosave", USERDEFS_AUTOSAVE, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + // { "", 1, 0, 0, -1 }, + { "god", USERDEFS_GOD, 0, 0, -1 }, + { "warp_on", USERDEFS_WARP_ON, 0, 0, -1 }, + { "cashman", USERDEFS_CASHMAN, 0, 0, -1 }, + { "eog", USERDEFS_EOG, 0, 0, -1 }, + { "showallmap", USERDEFS_SHOWALLMAP, 0, 0, -1 }, + { "show_help", USERDEFS_SHOW_HELP, 0, 0, -1 }, + { "scrollmode", USERDEFS_SCROLLMODE, 0, 0, -1 }, + { "clipping", USERDEFS_CLIPPING, 0, 0, -1 }, + { "user_name", USERDEFS_USER_NAME, LABEL_HASPARM2, MAXPLAYERS, -1 }, + { "ridecule", USERDEFS_RIDECULE, LABEL_HASPARM2 | LABEL_ISSTRING, 10, -1 }, + { "savegame", USERDEFS_SAVEGAME, LABEL_HASPARM2 | LABEL_ISSTRING, 10, -1 }, + { "pwlockout", USERDEFS_PWLOCKOUT, LABEL_ISSTRING, 128, -1 }, + { "rtsname;", USERDEFS_RTSNAME, LABEL_ISSTRING, 128, -1 }, + { "overhead_on", USERDEFS_OVERHEAD_ON, 0, 0, -1 }, + { "last_overhead", USERDEFS_LAST_OVERHEAD, 0, 0, -1 }, + { "showweapons", USERDEFS_SHOWWEAPONS, 0, 0, -1 }, + { "pause_on", USERDEFS_PAUSE_ON, 0, 0, -1 }, + { "from_bonus", USERDEFS_FROM_BONUS, 0, 0, -1 }, + { "camerasprite", USERDEFS_CAMERASPRITE, 0, 0, -1 }, + { "last_camsprite", USERDEFS_LAST_CAMSPRITE, 0, 0, -1 }, + { "last_level", USERDEFS_LAST_LEVEL, 0, 0, -1 }, + { "secretlevel", USERDEFS_SECRETLEVEL, 0, 0, -1 }, + { "const_visibility", USERDEFS_CONST_VISIBILITY, 0, 0, -1 }, + { "uw_framerate", USERDEFS_UW_FRAMERATE, 0, 0, -1 }, + { "camera_time", USERDEFS_CAMERA_TIME, 0, 0, -1 }, + { "folfvel", USERDEFS_FOLFVEL, 0, 0, -1 }, + { "folavel", USERDEFS_FOLAVEL, 0, 0, -1 }, + { "folx", USERDEFS_FOLX, 0, 0, -1 }, + { "foly", USERDEFS_FOLY, 0, 0, -1 }, + { "fola", USERDEFS_FOLA, 0, 0, -1 }, + { "reccnt", USERDEFS_RECCNT, 0, 0, -1 }, + { "entered_name", USERDEFS_ENTERED_NAME, 0, 0, -1 }, + { "screen_tilting", USERDEFS_SCREEN_TILTING, 0, 0, -1 }, + { "shadows", USERDEFS_SHADOWS, 0, 0, -1 }, + { "fta_on", USERDEFS_FTA_ON, 0, 0, -1 }, + { "executions", USERDEFS_EXECUTIONS, 0, 0, -1 }, + { "auto_run", USERDEFS_AUTO_RUN, 0, 0, -1 }, + { "coords", USERDEFS_COORDS, 0, 0, -1 }, + { "tickrate", USERDEFS_TICKRATE, 0, 0, -1 }, + { "m_coop", USERDEFS_M_COOP, 0, 0, -1 }, + { "coop", USERDEFS_COOP, 0, 0, -1 }, + { "screen_size", USERDEFS_SCREEN_SIZE, 0, 0, -1 }, + { "lockout", USERDEFS_LOCKOUT, 0, 0, -1 }, + { "crosshair", USERDEFS_CROSSHAIR, 0, 0, -1 }, + { "playerai", USERDEFS_PLAYERAI, 0, 0, -1 }, + { "respawn_monsters", USERDEFS_RESPAWN_MONSTERS, 0, 0, -1 }, + { "respawn_items", USERDEFS_RESPAWN_ITEMS, 0, 0, -1 }, + { "respawn_inventory", USERDEFS_RESPAWN_INVENTORY, 0, 0, -1 }, + { "recstat", USERDEFS_RECSTAT, 0, 0, -1 }, + { "monsters_off", USERDEFS_MONSTERS_OFF, 0, 0, -1 }, + { "brightness", USERDEFS_BRIGHTNESS, 0, 0, -1 }, + { "m_respawn_items", USERDEFS_M_RESPAWN_ITEMS, 0, 0, -1 }, + { "m_respawn_monsters", USERDEFS_M_RESPAWN_MONSTERS, 0, 0, -1 }, + { "m_respawn_inventory", USERDEFS_M_RESPAWN_INVENTORY, 0, 0, -1 }, + { "m_recstat", USERDEFS_M_RECSTAT, 0, 0, -1 }, + { "m_monsters_off", USERDEFS_M_MONSTERS_OFF, 0, 0, -1 }, + { "detail", USERDEFS_DETAIL, 0, 0, -1 }, + { "m_ffire", USERDEFS_M_FFIRE, 0, 0, -1 }, + { "ffire", USERDEFS_FFIRE, 0, 0, -1 }, + { "m_player_skill", USERDEFS_M_PLAYER_SKILL, 0, 0, -1 }, + { "m_level_number", USERDEFS_M_LEVEL_NUMBER, 0, 0, -1 }, + { "m_volume_number", USERDEFS_M_VOLUME_NUMBER, 0, 0, -1 }, + { "multimode", USERDEFS_MULTIMODE, 0, 0, -1 }, + { "player_skill", USERDEFS_PLAYER_SKILL, 0, 0, -1 }, + { "level_number", USERDEFS_LEVEL_NUMBER, 0, 0, -1 }, + { "volume_number", USERDEFS_VOLUME_NUMBER, 0, 0, -1 }, + { "m_marker", USERDEFS_M_MARKER, 0, 0, -1 }, + { "marker", USERDEFS_MARKER, 0, 0, -1 }, + { "mouseflip", USERDEFS_MOUSEFLIP, 0, 0, -1 }, + { "statusbarscale", USERDEFS_STATUSBARSCALE, 0, 0, -1 }, + { "drawweapon", USERDEFS_DRAWWEAPON, 0, 0, -1 }, + { "mouseaiming", USERDEFS_MOUSEAIMING, 0, 0, -1 }, + { "weaponswitch", USERDEFS_WEAPONSWITCH, 0, 0, -1 }, + { "democams", USERDEFS_DEMOCAMS, 0, 0, -1 }, + { "color", USERDEFS_COLOR, 0, 0, -1 }, + { "msgdisptime", USERDEFS_MSGDISPTIME, 0, 0, -1 }, + { "statusbarmode", USERDEFS_STATUSBARMODE, 0, 0, -1 }, + { "m_noexits", USERDEFS_M_NOEXITS, 0, 0, -1 }, + { "noexits", USERDEFS_NOEXITS, 0, 0, -1 }, + { "autovote", USERDEFS_AUTOVOTE, 0, 0, -1 }, + { "automsg", USERDEFS_AUTOMSG, 0, 0, -1 }, + { "idplayers", USERDEFS_IDPLAYERS, 0, 0, -1 }, + { "team", USERDEFS_TEAM, 0, 0, -1 }, + { "viewbob", USERDEFS_VIEWBOB, 0, 0, -1 }, + { "weaponsway", USERDEFS_WEAPONSWAY, 0, 0, -1 }, + { "angleinterpolation", USERDEFS_ANGLEINTERPOLATION, 0, 0, -1 }, + { "obituaries", USERDEFS_OBITUARIES, 0, 0, -1 }, + { "levelstats", USERDEFS_LEVELSTATS, 0, 0, -1 }, + { "crosshairscale", USERDEFS_CROSSHAIRSCALE, 0, 0, -1 }, + { "althud", USERDEFS_ALTHUD, 0, 0, -1 }, + { "display_bonus_screen", USERDEFS_DISPLAY_BONUS_SCREEN, 0, 0, -1 }, + { "show_level_text", USERDEFS_SHOW_LEVEL_TEXT, 0, 0, -1 }, + { "weaponscale", USERDEFS_WEAPONSCALE, 0, 0, -1 }, + { "textscale", USERDEFS_TEXTSCALE, 0, 0, -1 }, + { "runkey_mode", USERDEFS_RUNKEY_MODE, 0, 0, -1 }, + { "m_origin_x", USERDEFS_M_ORIGIN_X, 0, 0, -1 }, + { "m_origin_y", USERDEFS_M_ORIGIN_Y, 0, 0, -1 }, + { "playerbest", USERDEFS_PLAYERBEST, 0, 0, -1 }, + { "musictoggle", USERDEFS_MUSICTOGGLE, 0, 0, -1 }, + { "usevoxels", USERDEFS_USEVOXELS, 0, 0, -1 }, + { "usehightile", USERDEFS_USEHIGHTILE, 0, 0, -1 }, + { "usemodels", USERDEFS_USEMODELS, 0, 0, -1 }, + { "gametypeflags", USERDEFS_GAMETYPEFLAGS, 0, 0, -1 }, + { "m_gametypeflags", USERDEFS_M_GAMETYPEFLAGS, 0, 0, -1 }, + { "globalflags", USERDEFS_GLOBALFLAGS, 0, 0, -1 }, + { "globalgameflags", USERDEFS_GLOBALGAMEFLAGS, 0, 0, -1 }, + { "vm_player", USERDEFS_VM_PLAYER, 0, 0, -1 }, + { "vm_sprite", USERDEFS_VM_SPRITE, 0, 0, -1 }, + { "vm_distance", USERDEFS_VM_DISTANCE, 0, 0, -1 }, + { "soundtoggle", USERDEFS_SOUNDTOGGLE, 0, 0, -1 }, + { "gametext_tracking", USERDEFS_GAMETEXT_TRACKING, 0, 0, -1 }, + { "mgametext_tracking", USERDEFS_MGAMETEXT_TRACKING, 0, 0, -1 }, + { "menutext_tracking", USERDEFS_MENUTEXT_TRACKING, 0, 0, -1 }, + { "maxspritesonscreen", USERDEFS_MAXSPRITESONSCREEN, 0, 0, -1 }, + { "screenarea_x1", USERDEFS_SCREENAREA_X1, 0, 0, -1 }, + { "screenarea_y1", USERDEFS_SCREENAREA_Y1, 0, 0, -1 }, + { "screenarea_x2", USERDEFS_SCREENAREA_X2, 0, 0, -1 }, + { "screenarea_y2", USERDEFS_SCREENAREA_Y2, 0, 0, -1 }, + { "screenfade", USERDEFS_SCREENFADE, 0, 0, -1 }, + { "menubackground", USERDEFS_MENUBACKGROUND, 0, 0, -1 }, + { "statusbarflags", USERDEFS_STATUSBARFLAGS, 0, 0, -1 }, + { "statusbarrange", USERDEFS_STATUSBARRANGE, 0, 0, -1 }, + { "statusbarcustom", USERDEFS_STATUSBARCUSTOM, 0, 0, -1 }, + { "hudontop", USERDEFS_HUDONTOP, 0, 0, -1 }, + { "menu_slidebarz", USERDEFS_MENU_SLIDEBARZ, 0, 0, -1 }, + { "menu_slidebarmargin", USERDEFS_MENU_SLIDEBARMARGIN, 0, 0, -1 }, + { "menu_slidecursorz", USERDEFS_MENU_SLIDECURSORZ, 0, 0, -1 }, + { "global_r", USERDEFS_GLOBAL_R, 0, 0, -1 }, + { "global_g", USERDEFS_GLOBAL_G, 0, 0, -1 }, + { "global_b", USERDEFS_GLOBAL_B, 0, 0, -1 }, + { "default_volume", USERDEFS_DEFAULT_VOLUME, 0, 0, -1 }, + { "default_skill", USERDEFS_DEFAULT_SKILL, 0, 0, -1 }, + { "menu_shadedeselected", USERDEFS_MENU_SHADEDESELECTED, 0, 0, -1 }, + { "menu_shadedisabled", USERDEFS_MENU_SHADEDISABLED, 0, 0, -1 }, + { "menutext_zoom", USERDEFS_MENUTEXT_ZOOM, 0, 0, -1 }, + { "menutext_xspace", USERDEFS_MENUTEXT_XSPACE, 0, 0, -1 }, + { "menutext_pal", USERDEFS_MENUTEXT_PAL, 0, 0, -1 }, + { "menutext_palselected", USERDEFS_MENUTEXT_PALSELECTED, 0, 0, -1 }, + { "menutext_paldeselected", USERDEFS_MENUTEXT_PALDESELECTED, 0, 0, -1 }, + { "menutext_paldisabled", USERDEFS_MENUTEXT_PALDISABLED, 0, 0, -1 }, + { "menutext_palselected_right", USERDEFS_MENUTEXT_PALSELECTED_RIGHT, 0, 0, -1 }, + { "menutext_paldeselected_right", USERDEFS_MENUTEXT_PALDESELECTED_RIGHT, 0, 0, -1 }, + { "menutext_paldisabled_right", USERDEFS_MENUTEXT_PALDISABLED_RIGHT, 0, 0, -1 }, + { "gametext_zoom", USERDEFS_GAMETEXT_ZOOM, 0, 0, -1 }, + { "gametext_xspace", USERDEFS_GAMETEXT_XSPACE, 0, 0, -1 }, + { "gametext_pal", USERDEFS_GAMETEXT_PAL, 0, 0, -1 }, + { "gametext_palselected", USERDEFS_GAMETEXT_PALSELECTED, 0, 0, -1 }, + { "gametext_paldeselected", USERDEFS_GAMETEXT_PALDESELECTED, 0, 0, -1 }, + { "gametext_paldisabled", USERDEFS_GAMETEXT_PALDISABLED, 0, 0, -1 }, + { "gametext_palselected_right", USERDEFS_GAMETEXT_PALSELECTED_RIGHT, 0, 0, -1 }, + { "gametext_paldeselected_right", USERDEFS_GAMETEXT_PALDESELECTED_RIGHT, 0, 0, -1 }, + { "gametext_paldisabled_right", USERDEFS_GAMETEXT_PALDISABLED_RIGHT, 0, 0, -1 }, + { "minitext_zoom", USERDEFS_MINITEXT_ZOOM, 0, 0, -1 }, + { "minitext_xspace", USERDEFS_MINITEXT_XSPACE, 0, 0, -1 }, + { "minitext_tracking", USERDEFS_MINITEXT_TRACKING, 0, 0, -1 }, + { "minitext_pal", USERDEFS_MINITEXT_PAL, 0, 0, -1 }, + { "minitext_palselected", USERDEFS_MINITEXT_PALSELECTED, 0, 0, -1 }, + { "minitext_paldeselected", USERDEFS_MINITEXT_PALDESELECTED, 0, 0, -1 }, + { "minitext_paldisabled", USERDEFS_MINITEXT_PALDISABLED, 0, 0, -1 }, + { "minitext_palselected_right", USERDEFS_MINITEXT_PALSELECTED_RIGHT, 0, 0, -1 }, + { "minitext_paldeselected_right", USERDEFS_MINITEXT_PALDESELECTED_RIGHT, 0, 0, -1 }, + { "minitext_paldisabled_right", USERDEFS_MINITEXT_PALDISABLED_RIGHT, 0, 0, -1 }, + { "menutitle_pal", USERDEFS_MENUTITLE_PAL, 0, 0, -1 }, + { "slidebar_palselected", USERDEFS_SLIDEBAR_PALSELECTED, 0, 0, -1 }, + { "slidebar_paldisabled", USERDEFS_SLIDEBAR_PALDISABLED, 0, 0, -1 }, + { "user_map", USERDEFS_USER_MAP, 0, 0, -1 }, + { "m_user_map", USERDEFS_M_USER_MAP, 0, 0, -1 }, + { "music_episode", USERDEFS_MUSIC_EPISODE, 0, 0, -1 }, + { "music_level", USERDEFS_MUSIC_LEVEL, 0, 0, -1 }, + { "shadow_pal", USERDEFS_SHADOW_PAL, 0, 0, -1 }, + { "menu_scrollbartilenum", USERDEFS_MENU_SCROLLBARTILENUM, 0, 0, -1 }, + { "menu_scrollbarz", USERDEFS_MENU_SCROLLBARZ, 0, 0, -1 }, + { "menu_scrollcursorz", USERDEFS_MENU_SCROLLCURSORZ, 0, 0, -1 }, + { "return", USERDEFS_RETURN, LABEL_HASPARM2, MAX_RETURN_VALUES, -1 }, + { "userbyteversion", USERDEFS_USERBYTEVERSION, 0, 0, -1 }, + { "autosave", USERDEFS_AUTOSAVE, 0, 0, -1 }, }; const memberlabel_t InputLabels[]= { - { "avel", INPUT_AVEL, 0, 0 }, - { "q16avel", INPUT_Q16AVEL, 0, 0 }, - { "horz", INPUT_HORZ, 0, 0 }, - { "q16horz", INPUT_Q16HORZ, 0, 0 }, - { "fvel", INPUT_FVEL, 0, 0 }, - { "svel", INPUT_SVEL, 0, 0 }, - { "bits", INPUT_BITS, 0, 0 }, - { "extbits", INPUT_EXTBITS, 0, 0 }, - { NULL, -1, 0, 0 } // END OF LIST + { "avel", INPUT_AVEL, 0, 0, -1 }, + { "q16avel", INPUT_Q16AVEL, 0, 0, -1 }, + { "horz", INPUT_HORZ, 0, 0, -1 }, + { "q16horz", INPUT_Q16HORZ, 0, 0, -1 }, + { "fvel", INPUT_FVEL, 0, 0, -1 }, + { "svel", INPUT_SVEL, 0, 0, -1 }, + { "bits", INPUT_BITS, 0, 0, -1 }, + { "extbits", INPUT_EXTBITS, 0, 0, -1 }, }; const memberlabel_t TileDataLabels[]= { // tilesiz[] - { "xsize", TILEDATA_XSIZE, 0, 0 }, - { "ysize", TILEDATA_YSIZE, 0, 0 }, + { "xsize", TILEDATA_XSIZE, 0, 0, -1 }, + { "ysize", TILEDATA_YSIZE, 0, 0, -1 }, // picanm[] - { "animframes", TILEDATA_ANIMFRAMES, 0, 0 }, - { "xoffset", TILEDATA_XOFFSET, 0, 0 }, - { "yoffset", TILEDATA_YOFFSET, 0, 0 }, - { "animspeed", TILEDATA_ANIMSPEED, 0, 0 }, - { "animtype", TILEDATA_ANIMTYPE, 0, 0 }, + { "animframes", TILEDATA_ANIMFRAMES, 0, 0, -1 }, + { "xoffset", TILEDATA_XOFFSET, 0, 0, -1 }, + { "yoffset", TILEDATA_YOFFSET, 0, 0, -1 }, + { "animspeed", TILEDATA_ANIMSPEED, 0, 0, -1 }, + { "animtype", TILEDATA_ANIMTYPE, 0, 0, -1 }, // g_tile[] - { "gameflags", TILEDATA_GAMEFLAGS, 0, 0 }, - - { NULL, -1, 0, 0 } // END OF LIST + { "gameflags", TILEDATA_GAMEFLAGS, 0, 0, -1 }, }; const memberlabel_t PalDataLabels[]= { // g_noFloorPal[] - { "nofloorpal", PALDATA_NOFLOORPAL, 0, 0 }, - - { NULL, -1, 0, 0 } // END OF LIST + { "nofloorpal", PALDATA_NOFLOORPAL, 0, 0, -1 }, }; const tokenmap_t iter_tokens [] = @@ -1378,7 +1371,6 @@ const tokenmap_t iter_tokens [] = { "sprofsec", ITER_SPRITESOFSECTOR }, { "sprofstat", ITER_SPRITESOFSTATUS }, { "walofsec", ITER_WALLSOFSECTOR }, - { NULL, -1 } // END OF LIST }; #endif @@ -1389,66 +1381,59 @@ char *bitptr; // pointer to bitmap of which bytecode positions contain pointers #define BITPTR_IS_POINTER(x) (bitptr[(x)>>3] & (1<<((x) &7))) #if !defined LUNATIC -hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL }; hashtable_t h_arrays = { MAXGAMEARRAYS>>1, NULL }; +hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL }; hashtable_t h_labels = { 11264>>1, NULL }; -static hashtable_t h_keywords = { CON_END>>1, NULL }; -static hashtable_t h_iter = { ITER_END>>1, NULL }; - -static hashtable_t h_sector = { SECTOR_END>>1, NULL }; -static hashtable_t h_wall = { WALL_END>>1, NULL }; -static hashtable_t h_userdef = { USERDEFS_END>>1, NULL }; - -static hashtable_t h_projectile = { PROJ_END>>1, NULL }; -static hashtable_t h_player = { PLAYER_END>>1, NULL }; -static hashtable_t h_input = { INPUT_END>>1, NULL }; static hashtable_t h_actor = { ACTOR_END>>1, NULL }; -static hashtable_t h_tsprite = { ACTOR_END>>1, NULL }; - -static hashtable_t h_tiledata = { TILEDATA_END>>1, NULL }; +static hashtable_t h_input = { INPUT_END>>1, NULL }; +static hashtable_t h_iter = { ITER_END>>1, NULL }; +static hashtable_t h_keywords = { CON_END>>1, NULL }; static hashtable_t h_paldata = { PALDATA_END>>1, NULL }; +static hashtable_t h_player = { PLAYER_END>>1, NULL }; +static hashtable_t h_projectile = { PROJ_END>>1, NULL }; +static hashtable_t h_sector = { SECTOR_END>>1, NULL }; +static hashtable_t h_tiledata = { TILEDATA_END>>1, NULL }; +static hashtable_t h_tsprite = { ACTOR_END>>1, NULL }; +static hashtable_t h_userdef = { USERDEFS_END>>1, NULL }; +static hashtable_t h_wall = { WALL_END>>1, NULL }; -static hashtable_t * const tables[] = { - &h_gamevars, &h_arrays, &h_labels, &h_keywords, &h_sector, &h_wall, &h_userdef, - &h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata, - &h_iter +static hashtable_t *const tables[] = { + &h_actor, &h_arrays, &h_gamevars, &h_input, &h_iter, &h_keywords, &h_labels, &h_paldata, + &h_player, &h_projectile, &h_sector, &h_tiledata, &h_tsprite, &h_userdef, &h_wall, }; -static hashtable_t * const tables_free [] = { - &h_labels, &h_keywords, &h_sector, &h_wall, &h_userdef, - &h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata, - &h_iter +static hashtable_t *const tables_free[] = { + &h_actor, &h_input, &h_iter, &h_keywords, &h_labels, &h_paldata, + &h_player, &h_projectile, &h_sector, &h_tiledata, &h_tsprite, &h_userdef, &h_wall, }; -#define STRUCT_HASH_SETUP(table, labels) do { for (i=0; labels[i].lId >= 0; i++) hash_add(&table, labels[i].name, i, 0); } while (0) +#define STRUCT_HASH_SETUP(table, labels) do { for (int i=0; i < ARRAY_SSIZE(labels); i++) hash_add(&table, labels[i].name, i, 0); } while (0) void C_InitHashes() { - uint32_t i; - - for (i=0; i < ARRAY_SIZE(tables); i++) - hash_init(tables[i]); + for (auto table : tables) + hash_init(table); inithashnames(); initsoundhashnames(); - for (tokenmap_t const & keyword : vm_keywords) + for (auto &keyword : vm_keywords) hash_add(&h_keywords, keyword.token, keyword.val, 0); - STRUCT_HASH_SETUP(h_sector, SectorLabels); - STRUCT_HASH_SETUP(h_wall, WallLabels); - STRUCT_HASH_SETUP(h_userdef, UserdefsLabels); + STRUCT_HASH_SETUP(h_actor, ActorLabels); + STRUCT_HASH_SETUP(h_input, InputLabels); + STRUCT_HASH_SETUP(h_paldata, PalDataLabels); + STRUCT_HASH_SETUP(h_player, PlayerLabels); STRUCT_HASH_SETUP(h_projectile, ProjectileLabels); - STRUCT_HASH_SETUP(h_player, PlayerLabels); - STRUCT_HASH_SETUP(h_input, InputLabels); - STRUCT_HASH_SETUP(h_actor, ActorLabels); - STRUCT_HASH_SETUP(h_tsprite, TsprLabels); - STRUCT_HASH_SETUP(h_tiledata, TileDataLabels); - STRUCT_HASH_SETUP(h_paldata, PalDataLabels); + STRUCT_HASH_SETUP(h_sector, SectorLabels); + STRUCT_HASH_SETUP(h_tiledata, TileDataLabels); + STRUCT_HASH_SETUP(h_tsprite, TsprLabels); + STRUCT_HASH_SETUP(h_userdef, UserdefsLabels); + STRUCT_HASH_SETUP(h_wall, WallLabels); - for (i=0; iter_tokens[i].val >=0; i++) - hash_add(&h_iter, iter_tokens[i].token, iter_tokens[i].val, 0); + for (auto &iter_token : iter_tokens) + hash_add(&h_iter, iter_token.token, iter_token.val, 0); } #undef STRUCT_HASH_SETUP diff --git a/source/duke3d/src/gamedef.h b/source/duke3d/src/gamedef.h index 94a42640a..92741cf01 100644 --- a/source/duke3d/src/gamedef.h +++ b/source/duke3d/src/gamedef.h @@ -45,8 +45,12 @@ enum LABEL_EVENT = 64, }; -#define LABEL_HASPARM2 1 -#define LABEL_ISSTRING 2 +#define LABEL_CHAR sizeof(uint8_t) +#define LABEL_SHORT sizeof(uint16_t) +#define LABEL_INT sizeof(uint32_t) +#define LABEL_UNSIGNED 8 +#define LABEL_HASPARM2 16 +#define LABEL_ISSTRING 32 #define VM_INSTMASK 0xfff @@ -133,11 +137,15 @@ extern const char *EventNames[MAXEVENTS]; #if !defined LUNATIC extern intptr_t *g_scriptPtr; -typedef struct -{ - const char *name; - int lId, flags, maxParm2; -} memberlabel_t; + typedef struct + { + const char *name; + + int32_t lId; + uint32_t flags; + int16_t maxParm2; + int16_t offset; + } memberlabel_t; extern const memberlabel_t ActorLabels[]; extern const memberlabel_t InputLabels[];