From f34221f03b7b44cb3ceea8a9f597e49f8f89381a Mon Sep 17 00:00:00 2001 From: Walter Hennecke Date: Thu, 24 Nov 2011 13:54:54 +0100 Subject: [PATCH] Code cleanup Code clean up and C99 to ANSIC comments of game/bg_misc.c --- game/bg_misc.c | 971 +++++++++++++++++------------------------------- game/q_shared.h | 24 -- 2 files changed, 339 insertions(+), 656 deletions(-) diff --git a/game/bg_misc.c b/game/bg_misc.c index 01c38bc..5fba202 100644 --- a/game/bg_misc.c +++ b/game/bg_misc.c @@ -1,6 +1,7 @@ -// Copyright (C) 1999-2000 Id Software, Inc. -// -// bg_misc.c -- both games misc functions, all completely stateless +/* Copyright (C) 1999-2000 Id Software, Inc. + * + * bg_misc.c -- both games misc functions, all completely stateless + */ #include "q_shared.h" #include "bg_public.h" @@ -10,7 +11,7 @@ void trap_Cvar_VariableStringBuffer( const char *var_name, char *buffer, int buf void trap_FS_FCloseFile( fileHandle_t f ); void trap_FS_Read( void *buffer, int len, fileHandle_t f ); -// If you change these: PLEASE CHANGE THE COMMENTS ON THE AMMO PICKUPS, WHICH DETAIL THE QUANTITY IN THE CLIP +/* If you change these: PLEASE CHANGE THE COMMENTS ON THE AMMO PICKUPS, WHICH DETAIL THE QUANTITY IN THE CLIP*/ #define AMMO_PHASER_CLIP 50 #define AMMO_COMPRESSION_CLIP 32 #define AMMO_IMOD_CLIP 15 @@ -23,8 +24,9 @@ void trap_FS_Read( void *buffer, int len, fileHandle_t f ); char races[256]; -//TiM : Tidied up for programmer easability... O_o -//Marcin: not used since 30/12/2008 +/* + * TiM : Tidied up for programmer easability... O_o + * Marcin: not used since 30/12/2008*/ /** * Max ammo for each weapon. Unused. */ @@ -55,28 +57,6 @@ int Max_Ammo[WP_NUM_WEAPONS] = //64 // WP_TR116 }; -/*int Max_Ammo[WP_NUM_WEAPONS] = -{ - 0, // WP_NONE, - 50, // WP_PHASER, !! this should match PHASER_AMMO_MAX defined in bg_public - 128, // WP_COMPRESSION_RIFLE, - 60, // WP_NULL_HAND, - 100, // WP_COFFEE, - 50, // WP_DISRUPTOR, - 30, // WP_GRENADE_LAUNCHER, - 120, // WP_TR116, - 20, // WP_QUANTUM_BURST, - 50, // WP_DERMAL_REGEN, - 50, // WP_VOYAGER_HYPO, - 50, // WP_TOOLKIT, - 100, // WP_MEDKIT, - 50, // WP_TRICORDER, - 50, // WP_PADD, - 50, // WP_NEUTRINO_PROBE, - 64 // WP_TR116 - -};*/ - /*QUAKED item_***** ( 0 0 0 ) (-16 -16 -16) (16 16 16) suspended DO NOT USE THIS CLASS, IT JUST HOLDS GENERAL INFORMATION. The suspended flag will allow items to hang in the air, otherwise they are dropped to the next surface. @@ -96,38 +76,38 @@ An item fires all of its targets when it is picked up. If the toucher can't car gitem_t bg_itemlist[] = { { - NULL, //char *classname; // spawning name - NULL, //char *pickup_sound; - NULL, //char *world_model; - NULL, //char *view_model; -/* icon */ NULL, //char *icon; -/* pickup */ NULL, //char *pickup_name; // for printing on pickup - 0, //int quantity; // for ammo how much, or duration of powerup - 0, //itemType_t giType; // IT_* flags - 0, //int giTag; -/* precache */ "", //char *precaches; // string of all models and images this item will use -/* sounds */ "" //char *sounds; // string of all sounds this item will use - }, // leave index 0 alone + NULL, /* char *classname; */ + NULL, /* char *pickup_sound;*/ + NULL, /* char *world_model;*/ + NULL, /* char *view_model;*/ + NULL, /* char *icon;*/ + NULL, /* char *pickup_name; */ /* for printing on pickup */ + 0, /* int quantity; */ /* for ammo how much, or duration of powerup */ + 0, /* itemType_t giType; */ /* IT_* flags */ + 0, /* int giTag; */ + "", /* char *precaches; */ /* string of all models and images this item will use */ + "" /* char *sounds; */ /* string of all sounds this item will use */ + }, /* leave index 0 alone */ - // - // WEAPONS - // + /* + * WEAPONS + */ -//WP_NULL_HAND +/* WP_NULL_HAND */ /*QUAKED weapon_imod (.3 .3 1) (-16 -16 -16) (16 16 16) suspended */ { "weapon_null_hand", - "sound/silence.wav", //"sound/weapons/w_pkup.wav", - "models/weapons2/hand/hand_w.md3", //"models/weapons2/imod/imod2_w.md3",//world - "models/weapons2/hand/hand.md3", //"models/weapons2/imod/imod2.md3", //view -/* icon */ "icons/w_icon_hand", -/* pickup */ " ", + "sound/silence.wav", /* "sound/weapons/w_pkup.wav", */ + "models/weapons2/hand/hand_w.md3", /* "models/weapons2/imod/imod2_w.md3", */ /* world */ + "models/weapons2/hand/hand.md3", /* "models/weapons2/imod/imod2.md3", */ /* view */ + "icons/w_icon_hand", /* icon */ + " ", /* pickup */ AMMO_IMOD_CLIP, IT_WEAPON, WP_NULL_HAND, -/* precache */ "", -/* sounds */ "" + "", /* precache */ + "" /* sounds */ }, @@ -136,15 +116,15 @@ gitem_t bg_itemlist[] = { "weapon_tricorder", "sound/weapons/w_pkup.wav", - "models/weapons2/tricorder/tricorder_w.md3", //world - "models/weapons2/tricorder/tricorder.md3", //view -/* icon */ "icons/w_icon_tricorder", -/* pickup */ "Tricorder", + "models/weapons2/tricorder/tricorder_w.md3", /* world */ + "models/weapons2/tricorder/tricorder.md3", /* view */ + "icons/w_icon_tricorder", /* icon */ + "Tricorder", /* pickup */ AMMO_PHASER_CLIP, IT_WEAPON, WP_TRICORDER, -/* precache */ "", -/* sounds */ "" + "", /* precache */ + "" /* sounds */ }, /*QUAKED weapon_padd (.3 .3 1) (-16 -16 -16) (16 16 16) suspended @@ -152,15 +132,15 @@ gitem_t bg_itemlist[] = { "weapon_padd", "sound/weapons/w_pkup.wav", - "models/weapons2/padd/padd_w.md3", //world - "models/weapons2/padd/padd.md3", //view -/* icon */ "icons/w_icon_padd", -/* pickup */ "Padd", + "models/weapons2/padd/padd_w.md3", /* world */ + "models/weapons2/padd/padd.md3", /* view */ + "icons/w_icon_padd", /* icon */ + "Padd", /* pickup */ AMMO_PHASER_CLIP, IT_WEAPON, WP_PADD, -/* precache */ "", -/* sounds */ "", + "", /* precache */ + "", /* sounds */ }, /*QUAKED weapon_scavenger (.3 .3 1) (-16 -16 -16) (16 16 16) suspended @@ -168,15 +148,15 @@ gitem_t bg_itemlist[] = { "weapon_coffee", "sound/weapons/w_pkup.wav", - "models/weapons2/coffeecup/coffee_cup_w.md3", //world - "models/weapons2/coffeecup/coffee_cup.md3", //view -/* icon */ "icons/w_icon_coffee", -/* pickup */ "Coffee, Black", + "models/weapons2/coffeecup/coffee_cup_w.md3", /* world */ + "models/weapons2/coffeecup/coffee_cup.md3", /* view */ + "icons/w_icon_coffee", /* icon */ + "Coffee, Black", /* pickup */ AMMO_SCAVENGER_CLIP, IT_WEAPON, WP_COFFEE, -/* precache */ "", -/* sounds */ "" + "", /* precache */ + "" /* sounds */ }, /*QUAKED weapon_phaser (.3 .3 1) (-16 -16 -16) (16 16 16) suspended @@ -184,15 +164,15 @@ gitem_t bg_itemlist[] = { "weapon_phaser", "sound/weapons/w_pkup.wav", - "models/weapons2/phaser/phaser_w.md3", //world - "models/weapons2/phaser/phaser.md3", //view -/* icon */ "icons/w_icon_phaser", -/* pickup */ "Phaser", + "models/weapons2/phaser/phaser_w.md3", /* world */ + "models/weapons2/phaser/phaser.md3", /* view */ + "icons/w_icon_phaser", /* icon */ + "Phaser", /* pickup */ AMMO_PHASER_CLIP, IT_WEAPON, WP_PHASER, -/* precache */ "", -/* sounds */ "" + "", /* precache */ + "" /* sounds */ }, /*QUAKED weapon_compressionrifle (.3 .3 1) (-16 -16 -16) (16 16 16) suspended @@ -631,42 +611,6 @@ pick it up and it stays in your inventory until used, at which time it sets your // POWERUP ITEMS // - -//Transporter ent - quad no more -/*QUAKED item_quad (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -multiplies your weapon's damage for 30 seconds -*/ -// { -// "item_quad", -// "sound/items/quaddamage.wav", -// "models/powerups/trek/quad_damage.md3", //world -// NULL, -///* icon */ "icons/dm_quad", -///* pickup */ "Quantum Weapon Enhancer", -// 30, -// IT_POWERUP, -// PW_QUAD, -///* precache */ "", -///* sounds */ "sound/items/damage3.wav" -// }, - -/*QUAKED item_enviro (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -20 seconds of invulnerability -*/ -// { -// "item_enviro", -// "sound/items/protect.wav", -// "models/powerups/trek/armor3.md3", //world -// NULL, -///* icon */ "icons/envirosuit", -///* pickup */ "Metaphasic Shielding", -// 20, -// IT_POWERUP, -// PW_BOLTON, -///* precache */ "", -///* sounds */ "sound/items/protect3.wav" -// }, - /*QUAKED item_haste (.3 .3 1) (-16 -16 -16) (16 16 16) suspended for 30 seconds you run at %150 of your normal speed and your firing delays are 3/4 as long */ @@ -701,24 +645,6 @@ for 30 seconds you run at %150 of your normal speed and your firing delays are 3 /* sounds */ "" }, -//TiM : No regen. it's a laser now -/*QUAKED item_regen (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -for 30 seconds you get 5 health every second, up to 200 health -*/ -// { -// "item_regen", -// "sound/items/regeneration.wav", -// "models/powerups/trek/regen.md3", //world -// NULL, -///* icon */ "icons/regen", -///* pickup */ "Nano-Regenerative Protoplasmer", -// 30, -// IT_POWERUP, -// PW_LASER, -///* precache */ "", -///* sounds */ "sound/items/regen.wav" -// }, - /*QUAKED item_flight (.3 .3 1) (-16 -16 -16) (16 16 16) suspended 30 seconds of flight */ @@ -736,40 +662,6 @@ for 30 seconds you get 5 health every second, up to 200 health /* sounds */ "sound/items/flight.wav" }, -/*QUAKED team_CTF_redflag (1 0 0) (-24 -24 -16) (24 24 32) -Only in CTF games -*/ - //{ - // "team_CTF_redflag", - // "sound/voice/computer/misc/haveflag.wav", - // "models/flags/flag_red.md3", //world !! must match cg_main media and botfiles/items.c !! - // NULL, -///* icon */ "icons/iconf_red", -///* pickup */ "Red Flag", -// 0, -// IT_TEAM, -// PW_REDFLAG, -///* precache */ "", -///* sounds */ "sound/voice/computer/misc/stolen.wav sound/voice/computer/misc/stolen_e.wav sound/voice/computer/misc/returned.wav sound/voice/computer/misc/returned_e.wav" -// }, - -/*QUAKED team_CTF_blueflag (0 0 1) (-24 -24 -16) (24 24 32) -Only in CTF games -*/ -// { -// "team_CTF_blueflag", -// "sound/voice/computer/misc/haveflag.wav", - // "models/flags/flag_blue.md3",//must match cg_main media and botfiles/items.c -// NULL, -///* icon */ "icons/iconf_blu", -///* pickup */ "Blue Flag", -// 0, -// IT_TEAM, -// PW_REDFLAG, -///* precache */ "", -///* sounds */ "sound/voice/computer/misc/dropped.wav sound/voice/computer/misc/dropped_e.wav sound/voice/computer/misc/scored.wav sound/voice/computer/misc/scored_e.wav" -// }, - /*QUAKED holdable_detpack (.3 .3 1) (-16 -16 -16) (16 16 16) suspended BLAMMO! */ @@ -787,24 +679,6 @@ BLAMMO! /* sounds */ "sound/weapons/detpacklatch.wav sound/weapons/explosions/detpakexplode.wav" }, -//TiM No more seeker - flashlight now -/*QUAKED item_seeker (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -30 seconds of seeker drone -*/ -// { -// "item_seeker", -// "sound/player/pickupenergy.wav", -// "models/powerups/trek/flyer.md3", //world -// NULL, -///* icon */ "icons/icon_seeker", -///* pickup */ "Seeker Drone", -// 30, -// IT_POWERUP, -// PW_FLASHLIGHT, -///* precache */ "", -///* sounds */ "" -// }, - /*QUAKED holdable_shield (.3 .3 1) (-16 -16 -16) (16 16 16) suspended About 25 seconds or 250 hit points of a portashield. */ @@ -844,22 +718,6 @@ About 1 minute of a holographic decoy. // New Weapons // -/*QUAKED weapon_tr116 (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ -// { -// "weapon_tr116", -// "sound/weapons/w_pkup.wav", -// "models/weapons2/tr116/tr116_w.md3", //world -// "models/weapons2/tr116/tr116.md3", //view -///* icon */ "icons/w_icon_tr116", -///* pickup */ "TR-116", -// AMMO_PHASER_CLIP, -// IT_WEAPON, -// WP_TR116, -///* precache */ "", -///* sounds */ "" -// }, - // end of list marker {NULL} }; @@ -867,212 +725,212 @@ About 1 minute of a holographic decoy. int bg_numItems = sizeof(bg_itemlist) / sizeof(bg_itemlist[0]) - 1; #define STAND_VIEWHEIGHT (DEFAULT_VIEWHEIGHT) -#define SITTING_VIEWHEIGHT (22) //TiM: To reduce redundancy here +#define SITTING_VIEWHEIGHT (22) /* TiM: To reduce redundancy here */ #define CROUCHING_VIEWHEIGHT (CROUCH_VIEWHEIGHT) #define HITBOX_DEFAULT 32 #define HITBOX_CROUCH 16 -#define HITBOX_NULL -23 //0 //-24 doesn't work on patch meshes apparently. That might be more the mapper's fault than mine tho lol +#define HITBOX_NULL -23 /*0 //-24 doesn't work on patch meshes apparently. That might be more the mapper's fault than mine tho lol */ #define NULL_ANIM -1 -//!Main emotes definition arrayzor -//Suffice it to say... my hands hurt after writing this thing >.< +/* + * !Main emotes definition arrayzor + * Suffice it to say... my hands hurt after writing this thing >.< + */ emoteList_t bg_emoteList[] = { - //name //type //enumName //enumLoop //viewHeight //hitBox Height //bodyFlags //animFlags + //name //type //enumName //enumLoop //viewHeight //hitBox Height //bodyFlags //animFlags { "alert", TYPE_MISC, -1, NULL_ANIM, 0, 0, 0, 0, }, { "alert2", TYPE_MISC, -1, NULL_ANIM, 0, 0, 0, 0, }, - { "assimilated", TYPE_FULLBODY, BOTH_ASSIMILATED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_ALL | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "", TYPE_NONE, -1, NULL_ANIM, 0, 0, 0, 0, }, - { "benchsit1_2stand", TYPE_SITTING, BOTH_BENCHSIT1_2STAND, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "benchsit1_fixboot", TYPE_SITTING, BOTH_BENCHSIT1_FIXBOOT, BOTH_BENCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_REVERTLOOP_BOTH }, - { "benchsit1_idle", TYPE_SITTING, BOTH_BENCHSIT1_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_BOTH }, - { "benchsit1to2", TYPE_SITTING, BOTH_BENCHSIT1TO2, BOTH_BENCHSIT2_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "benchsit2_idle", TYPE_SITTING, BOTH_BENCHSIT2_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_BOTH }, - { "benchsit2to1", TYPE_SITTING, BOTH_BENCHSIT2TO1, BOTH_BENCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "catch1", TYPE_FULLBODY, BOTH_CATCH1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "console1", TYPE_CONSOLE, BOTH_CONSOLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console1_idle", TYPE_CONSOLE, BOTH_CONSOLE1IDLE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "console1_left", TYPE_CONSOLE, BOTH_CONSOLE1LEFT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console1_right", TYPE_CONSOLE, BOTH_CONSOLE1RIGHT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console2", TYPE_CONSOLE, BOTH_CONSOLE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "console3", TYPE_CONSOLE, BOTH_CONSOLE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console3_idle", TYPE_CONSOLE, BOTH_CONSOLE3IDLE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console3_left", TYPE_CONSOLE, BOTH_CONSOLE3LEFT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console3_right", TYPE_CONSOLE, BOTH_CONSOLE3RIGHT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console4", TYPE_CONSOLE, BOTH_CONSOLE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "console5", TYPE_CONSOLE, BOTH_CONSOLE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "couchsit1_2stand", TYPE_SITTING, BOTH_COUCHSIT1_2STAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "couchsit1_left", TYPE_SITTING, BOTH_COUCHSIT1_GESTURELEFT, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "couchsit1_right", TYPE_SITTING, BOTH_COUCHSIT1_GESTURERIGHT,BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "couchsit1_idle", TYPE_SITTING, BOTH_COUCHSIT1_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "couchsit1_talk", TYPE_SITTING, BOTH_COUCHSIT1_TALKGESTURE, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "couchsit2to1", TYPE_SITTING, BOTH_COUCHSIT1_TO2, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_REVERTLOOP_UPPER }, - { "couchsit2_idle", TYPE_SITTING, BOTH_COUCHSIT2, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "coverup1_end", TYPE_FULLBODY, BOTH_COVERUP1_END, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "coverup1_loop", TYPE_FULLBODY, BOTH_COVERUP1_LOOP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "coverup1_start", TYPE_FULLBODY, BOTH_COVERUP1_START, BOTH_COVERUP1_LOOP, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "cowar1", TYPE_FULLBODY, BOTH_COWAR1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "crowdlook1", TYPE_FULLBODY, BOTH_CROWDLOOK1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "crowdlook2", TYPE_FULLBODY, BOTH_CROWDLOOK2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "crowdlook3", TYPE_MISC, BOTH_CROWDLOOK3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH | EMOTE_LOOP_BOTH }, - { "crowdlook4", TYPE_MISC, BOTH_CROWDLOOK4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "dive1", TYPE_FULLBODY, BOTH_DIVE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_ALL | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "eyes_shut", TYPE_MISC, -1, 0, 0, 0, 0, 0, }, - { "eyes_angry", TYPE_MISC, -1, 0, 0, 0, 0, 0, }, - { "gesture2", TYPE_GESTURE, BOTH_GESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "gesture3", TYPE_GESTURE, BOTH_GESTURE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "get_up1", TYPE_FULLBODY, BOTH_GET_UP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "grab1", TYPE_FULLBODY, BOTH_GRAB1, BOTH_GRAB2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "grab2", TYPE_FULLBODY, BOTH_GRAB2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "grab3", TYPE_FULLBODY, BOTH_GRAB3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "grab4", TYPE_FULLBODY, BOTH_GRAB4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "grabbed1", TYPE_FULLBODY, BOTH_GRABBED1, BOTH_GRABBED2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "grabbed2", TYPE_FULLBODY, BOTH_GRABBED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "groundshake1", TYPE_FULLBODY, BOTH_GROUNDSHAKE1, BOTH_GROUNDSHAKE1LOOP, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "groundshake1loop", TYPE_FULLBODY, BOTH_GROUNDSHAKE1LOOP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "groundshake2", TYPE_FULLBODY, BOTH_GROUNDSHAKE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "guard_idle1", TYPE_MISC, BOTH_GUARD_IDLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "guard_lkrt1", TYPE_MISC, BOTH_GUARD_LKRT1, BOTH_GUARD_IDLE1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "guard_lookaround1", TYPE_MISC, BOTH_GUARD_LOOKAROUND1, BOTH_GUARD_IDLE1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "guilt1", TYPE_FULLBODY, BOTH_GUILT1, NULL_ANIM, CROUCHING_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "hitwall1", TYPE_FULLBODY, BOTH_HITWALL1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "help1", TYPE_FULLBODY, BOTH_HELP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "injured1", TYPE_INJURED, BOTH_INJURED1, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, - { "injured2", TYPE_INJURED, BOTH_INJURED2, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, - { "injured3", TYPE_INJURED, BOTH_INJURED3, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, - { "injured4", TYPE_INJURED, BOTH_INJURED4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, - { "injured4to5", TYPE_INJURED, BOTH_INJURED4TO5, BOTH_INJURED5, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "injured5", TYPE_INJURED, BOTH_INJURED5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "injured6", TYPE_INJURED, BOTH_INJURED6, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "injured6_combadge", TYPE_INJURED, BOTH_INJURED6COMBADGE, BOTH_INJURED6, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "injured6_point", TYPE_INJURED, BOTH_INJURED6POINT, BOTH_INJURED6, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "kneel_hand1", TYPE_MISC, BOTH_KNEELHAND1, NULL_ANIM, CROUCHING_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "laugh1", TYPE_FULLBODY, BOTH_LAUGH2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "laugh2", TYPE_FULLBODY, BOTH_LAUGH1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "lean1", TYPE_MISC, BOTH_LEAN1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "pain2writhe1", TYPE_FULLBODY, BOTH_PAIN2WRITHE1, BOTH_WRITHING1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "possessed1", TYPE_FULLBODY, BOTH_POSSESSED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "possessed2", TYPE_FULLBODY, BOTH_POSSESSED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "psychicshock1", TYPE_FULLBODY, BOTH_PSYCHICSHOCK1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "psychicshock2", TYPE_FULLBODY, BOTH_PSYCHICSHOCK2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "scared2", TYPE_FULLBODY, BOTH_SCARED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "shield1", TYPE_FULLBODY, BOTH_SHIELD1, BOTH_SHIELD2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "shield2", TYPE_FULLBODY, BOTH_SHIELD2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, - { "sit1stand", TYPE_SITTING, BOTH_SIT1STAND, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_BOTH }, - { "sit1to2", TYPE_SITTING, BOTH_SIT1TO2, BOTH_SIT2, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit1to3", TYPE_SITTING, BOTH_SIT1TO3, BOTH_SIT3, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit1", TYPE_SITTING, BOTH_SIT1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit2to1", TYPE_SITTING, BOTH_SIT2TO1, BOTH_SIT1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit2to3", TYPE_SITTING, BOTH_SIT2TO3, BOTH_SIT3, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit2", TYPE_SITTING, BOTH_SIT2, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit3to1", TYPE_SITTING, BOTH_SIT3TO1, BOTH_SIT1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit3to2", TYPE_SITTING, BOTH_SIT3TO2, BOTH_SIT2, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit3", TYPE_SITTING, BOTH_SIT3, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit4to5", TYPE_SITTING, BOTH_SIT4TO5, BOTH_SIT5, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit4to6", TYPE_SITTING, BOTH_SIT4TO6, BOTH_SIT6, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit4", TYPE_SITTING, BOTH_SIT4, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit5to4", TYPE_SITTING, BOTH_SIT5TO4, BOTH_SIT4, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit5to6", TYPE_SITTING, BOTH_SIT5TO6, BOTH_SIT6, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit5", TYPE_SITTING, BOTH_SIT5, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit6to4", TYPE_SITTING, BOTH_SIT6TO4, BOTH_SIT4, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit6to5", TYPE_SITTING, BOTH_SIT6TO5, BOTH_SIT5, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sit6", TYPE_SITTING, BOTH_SIT6, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sit7", TYPE_SITTING, BOTH_SIT7, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH, }, - { "sit7tostand1", TYPE_SITTING, BOTH_SIT7TOSTAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sleep1", TYPE_MISC, BOTH_SLEEP1, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sleep1_nose", TYPE_MISC, BOTH_SLEEP1_NOSE, BOTH_SLEEP1, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sleep1_getup", TYPE_MISC, BOTH_SLEEP1GETUP, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sleep2", TYPE_MISC, BOTH_SLEEP2, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sleep2_shift", TYPE_MISC, BOTH_SLEEP2_SHIFT, BOTH_SLEEP2, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sleep2_getup", TYPE_MISC, BOTH_SLEEP2GETUP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "sleep3", TYPE_MISC, BOTH_SLEEP3, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "sleep3getup", TYPE_MISC, BOTH_SLEEP3GETUP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "snapto1", TYPE_FULLBODY, BOTH_SNAPTO1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "snapto2", TYPE_FULLBODY, BOTH_SNAPTO2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random1", TYPE_GESTURE, BOTH_STAND1_RANDOM2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random2", TYPE_GESTURE, BOTH_STAND1_RANDOM3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random3", TYPE_GESTURE, BOTH_STAND1_RANDOM4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random4", TYPE_GESTURE, BOTH_STAND1_RANDOM5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random5", TYPE_GESTURE, BOTH_STAND1_RANDOM6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random6", TYPE_GESTURE, BOTH_STAND1_RANDOM7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random7", TYPE_GESTURE, BOTH_STAND1_RANDOM8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random8", TYPE_GESTURE, BOTH_STAND1_RANDOM9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random9", TYPE_GESTURE, BOTH_STAND1_RANDOM10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand1_random10", TYPE_GESTURE, BOTH_STAND1_RANDOM11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random1", TYPE_GESTURE, BOTH_STAND2_RANDOM1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random2", TYPE_GESTURE, BOTH_STAND2_RANDOM2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random3", TYPE_GESTURE, BOTH_STAND2_RANDOM3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random4", TYPE_GESTURE, BOTH_STAND2_RANDOM4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random5", TYPE_GESTURE, BOTH_STAND2_RANDOM5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random6", TYPE_GESTURE, BOTH_STAND2_RANDOM6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random7", TYPE_GESTURE, BOTH_STAND2_RANDOM7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random8", TYPE_GESTURE, BOTH_STAND2_RANDOM8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random9", TYPE_GESTURE, BOTH_STAND2_RANDOM9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random10", TYPE_GESTURE, BOTH_STAND2_RANDOM10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random11", TYPE_GESTURE, BOTH_STAND2_RANDOM11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand2_random12", TYPE_GESTURE, BOTH_STAND2_RANDOM12, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - { "stand3", TYPE_MISC, BOTH_STAND3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "standup1", TYPE_FULLBODY, BOTH_STANDUP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "surprised1", TYPE_FULLBODY, BOTH_SURPRISED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, - { "surprised2", TYPE_FULLBODY, BOTH_SURPRISED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, - { "surprised3", TYPE_FULLBODY, BOTH_SURPRISED3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, - { "surprised4", TYPE_FULLBODY, BOTH_SURPRISED4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, - { "surprised5", TYPE_FULLBODY, BOTH_SURPRISED5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, - { "table_eat1", TYPE_MISC, BOTH_TABLE_EAT1, BOTH_TABLE_IDLE1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "table_getup1", TYPE_MISC, BOTH_TABLE_GETUP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "table_idle1", TYPE_MISC, BOTH_TABLE_IDLE1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "table_talkgesture1", TYPE_MISC, BOTH_TABLE_TALKGESTURE1, BOTH_TABLE_IDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, - { "talkgesture1", TYPE_GESTURE, BOTH_TALKGESTURE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "talkgesture2", TYPE_GESTURE, BOTH_TALKGESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "talkgesture3", TYPE_GESTURE, TORSO_TALKGESTURE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "talkgesture4", TYPE_GESTURE, TORSO_TALKGESTURE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "writhing2", TYPE_FULLBODY, BOTH_WRITHING2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, - { "combadge1", TYPE_GESTURE, TORSO_COMBADGE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "combadge2", TYPE_GESTURE, TORSO_COMBADGE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "combadge3", TYPE_GESTURE, TORSO_COMBADGE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "combadge4", TYPE_GESTURE, TORSO_COMBADGE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "equipment1", TYPE_GESTURE, TORSO_EQUIPMENT1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "equipment2", TYPE_GESTURE, TORSO_EQUIPMENT2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "equipment3", TYPE_GESTURE, TORSO_EQUIPMENT3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "grablbackl", TYPE_GESTURE, TORSO_GRABLBACKL, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "hand1", TYPE_GESTURE, TORSO_HAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "hand2", TYPE_GESTURE, TORSO_HAND2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture1", TYPE_GESTURE, TORSO_HANDGESTURE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture2", TYPE_GESTURE, TORSO_HANDGESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture3", TYPE_GESTURE, TORSO_HANDGESTURE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture4", TYPE_GESTURE, TORSO_HANDGESTURE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture5", TYPE_GESTURE, TORSO_HANDGESTURE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture6", TYPE_GESTURE, TORSO_HANDGESTURE6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture7", TYPE_GESTURE, TORSO_HANDGESTURE7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture8", TYPE_GESTURE, TORSO_HANDGESTURE8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture9", TYPE_GESTURE, TORSO_HANDGESTURE9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture10", TYPE_GESTURE, TORSO_HANDGESTURE10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture11", TYPE_GESTURE, TORSO_HANDGESTURE11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture12", TYPE_GESTURE, TORSO_HANDGESTURE12, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "handgesture13", TYPE_GESTURE, TORSO_HANDGESTURE13, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "hypospray", TYPE_GESTURE, TORSO_HYPOSPRAY1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "pokeridle1", TYPE_GESTURE, TORSO_POKERIDLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, - { "pokeridle2", TYPE_GESTURE, TORSO_POKERIDLE2, TORSO_POKERIDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER }, - { "pokeridle3", TYPE_GESTURE, TORSO_POKERIDLE3, TORSO_POKERIDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "shout1", TYPE_GESTURE, TORSO_SHOUT1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, - { "speechless1", TYPE_GESTURE, TORSO_SPEECHLESS1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, - { "speechless2", TYPE_GESTURE, TORSO_SPEECHLESS2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, - { "taunt", TYPE_GESTURE, TORSO_GESTURE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - { "wrist1", TYPE_GESTURE, TORSO_WRIST1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "assimilated", TYPE_FULLBODY, BOTH_ASSIMILATED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_ALL | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "", TYPE_NONE, -1, NULL_ANIM, 0, 0, 0, 0, }, + { "benchsit1_2stand", TYPE_SITTING, BOTH_BENCHSIT1_2STAND, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "benchsit1_fixboot", TYPE_SITTING, BOTH_BENCHSIT1_FIXBOOT, BOTH_BENCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_REVERTLOOP_BOTH }, + { "benchsit1_idle", TYPE_SITTING, BOTH_BENCHSIT1_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_BOTH }, + { "benchsit1to2", TYPE_SITTING, BOTH_BENCHSIT1TO2, BOTH_BENCHSIT2_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "benchsit2_idle", TYPE_SITTING, BOTH_BENCHSIT2_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_BOTH }, + { "benchsit2to1", TYPE_SITTING, BOTH_BENCHSIT2TO1, BOTH_BENCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "catch1", TYPE_FULLBODY, BOTH_CATCH1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "console1", TYPE_CONSOLE, BOTH_CONSOLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console1_idle", TYPE_CONSOLE, BOTH_CONSOLE1IDLE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "console1_left", TYPE_CONSOLE, BOTH_CONSOLE1LEFT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console1_right", TYPE_CONSOLE, BOTH_CONSOLE1RIGHT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console2", TYPE_CONSOLE, BOTH_CONSOLE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "console3", TYPE_CONSOLE, BOTH_CONSOLE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console3_idle", TYPE_CONSOLE, BOTH_CONSOLE3IDLE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console3_left", TYPE_CONSOLE, BOTH_CONSOLE3LEFT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console3_right", TYPE_CONSOLE, BOTH_CONSOLE3RIGHT, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console4", TYPE_CONSOLE, BOTH_CONSOLE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "console5", TYPE_CONSOLE, BOTH_CONSOLE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "couchsit1_2stand", TYPE_SITTING, BOTH_COUCHSIT1_2STAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "couchsit1_left", TYPE_SITTING, BOTH_COUCHSIT1_GESTURELEFT, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "couchsit1_right", TYPE_SITTING, BOTH_COUCHSIT1_GESTURERIGHT,BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "couchsit1_idle", TYPE_SITTING, BOTH_COUCHSIT1_IDLE, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "couchsit1_talk", TYPE_SITTING, BOTH_COUCHSIT1_TALKGESTURE, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "couchsit2to1", TYPE_SITTING, BOTH_COUCHSIT1_TO2, BOTH_COUCHSIT1_IDLE, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_REVERTLOOP_UPPER }, + { "couchsit2_idle", TYPE_SITTING, BOTH_COUCHSIT2, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "coverup1_end", TYPE_FULLBODY, BOTH_COVERUP1_END, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "coverup1_loop", TYPE_FULLBODY, BOTH_COVERUP1_LOOP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "coverup1_start", TYPE_FULLBODY, BOTH_COVERUP1_START, BOTH_COVERUP1_LOOP, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "cowar1", TYPE_FULLBODY, BOTH_COWAR1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "crowdlook1", TYPE_FULLBODY, BOTH_CROWDLOOK1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "crowdlook2", TYPE_FULLBODY, BOTH_CROWDLOOK2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "crowdlook3", TYPE_MISC, BOTH_CROWDLOOK3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH | EMOTE_LOOP_BOTH }, + { "crowdlook4", TYPE_MISC, BOTH_CROWDLOOK4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "dive1", TYPE_FULLBODY, BOTH_DIVE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_ALL | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "eyes_shut", TYPE_MISC, -1, 0, 0, 0, 0, 0, }, + { "eyes_angry", TYPE_MISC, -1, 0, 0, 0, 0, 0, }, + { "gesture2", TYPE_GESTURE, BOTH_GESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "gesture3", TYPE_GESTURE, BOTH_GESTURE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "get_up1", TYPE_FULLBODY, BOTH_GET_UP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "grab1", TYPE_FULLBODY, BOTH_GRAB1, BOTH_GRAB2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "grab2", TYPE_FULLBODY, BOTH_GRAB2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "grab3", TYPE_FULLBODY, BOTH_GRAB3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "grab4", TYPE_FULLBODY, BOTH_GRAB4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "grabbed1", TYPE_FULLBODY, BOTH_GRABBED1, BOTH_GRABBED2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "grabbed2", TYPE_FULLBODY, BOTH_GRABBED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "groundshake1", TYPE_FULLBODY, BOTH_GROUNDSHAKE1, BOTH_GROUNDSHAKE1LOOP, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "groundshake1loop", TYPE_FULLBODY, BOTH_GROUNDSHAKE1LOOP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "groundshake2", TYPE_FULLBODY, BOTH_GROUNDSHAKE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "guard_idle1", TYPE_MISC, BOTH_GUARD_IDLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "guard_lkrt1", TYPE_MISC, BOTH_GUARD_LKRT1, BOTH_GUARD_IDLE1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "guard_lookaround1", TYPE_MISC, BOTH_GUARD_LOOKAROUND1, BOTH_GUARD_IDLE1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "guilt1", TYPE_FULLBODY, BOTH_GUILT1, NULL_ANIM, CROUCHING_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "hitwall1", TYPE_FULLBODY, BOTH_HITWALL1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "help1", TYPE_FULLBODY, BOTH_HELP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "injured1", TYPE_INJURED, BOTH_INJURED1, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, + { "injured2", TYPE_INJURED, BOTH_INJURED2, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, + { "injured3", TYPE_INJURED, BOTH_INJURED3, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, + { "injured4", TYPE_INJURED, BOTH_INJURED4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH, }, + { "injured4to5", TYPE_INJURED, BOTH_INJURED4TO5, BOTH_INJURED5, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "injured5", TYPE_INJURED, BOTH_INJURED5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "injured6", TYPE_INJURED, BOTH_INJURED6, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "injured6_combadge", TYPE_INJURED, BOTH_INJURED6COMBADGE, BOTH_INJURED6, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "injured6_point", TYPE_INJURED, BOTH_INJURED6POINT, BOTH_INJURED6, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "kneel_hand1", TYPE_MISC, BOTH_KNEELHAND1, NULL_ANIM, CROUCHING_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "laugh1", TYPE_FULLBODY, BOTH_LAUGH2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "laugh2", TYPE_FULLBODY, BOTH_LAUGH1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "lean1", TYPE_MISC, BOTH_LEAN1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "pain2writhe1", TYPE_FULLBODY, BOTH_PAIN2WRITHE1, BOTH_WRITHING1, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "possessed1", TYPE_FULLBODY, BOTH_POSSESSED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "possessed2", TYPE_FULLBODY, BOTH_POSSESSED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "psychicshock1", TYPE_FULLBODY, BOTH_PSYCHICSHOCK1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "psychicshock2", TYPE_FULLBODY, BOTH_PSYCHICSHOCK2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "scared2", TYPE_FULLBODY, BOTH_SCARED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "shield1", TYPE_FULLBODY, BOTH_SHIELD1, BOTH_SHIELD2, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "shield2", TYPE_FULLBODY, BOTH_SHIELD2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_BOTH }, + { "sit1stand", TYPE_SITTING, BOTH_SIT1STAND, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_BOTH }, + { "sit1to2", TYPE_SITTING, BOTH_SIT1TO2, BOTH_SIT2, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit1to3", TYPE_SITTING, BOTH_SIT1TO3, BOTH_SIT3, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit1", TYPE_SITTING, BOTH_SIT1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit2to1", TYPE_SITTING, BOTH_SIT2TO1, BOTH_SIT1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit2to3", TYPE_SITTING, BOTH_SIT2TO3, BOTH_SIT3, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit2", TYPE_SITTING, BOTH_SIT2, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit3to1", TYPE_SITTING, BOTH_SIT3TO1, BOTH_SIT1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit3to2", TYPE_SITTING, BOTH_SIT3TO2, BOTH_SIT2, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit3", TYPE_SITTING, BOTH_SIT3, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit4to5", TYPE_SITTING, BOTH_SIT4TO5, BOTH_SIT5, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit4to6", TYPE_SITTING, BOTH_SIT4TO6, BOTH_SIT6, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit4", TYPE_SITTING, BOTH_SIT4, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit5to4", TYPE_SITTING, BOTH_SIT5TO4, BOTH_SIT4, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit5to6", TYPE_SITTING, BOTH_SIT5TO6, BOTH_SIT6, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit5", TYPE_SITTING, BOTH_SIT5, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit6to4", TYPE_SITTING, BOTH_SIT6TO4, BOTH_SIT4, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit6to5", TYPE_SITTING, BOTH_SIT6TO5, BOTH_SIT5, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sit6", TYPE_SITTING, BOTH_SIT6, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sit7", TYPE_SITTING, BOTH_SIT7, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_CROUCH, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_LOOP_BOTH, }, + { "sit7tostand1", TYPE_SITTING, BOTH_SIT7TOSTAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sleep1", TYPE_MISC, BOTH_SLEEP1, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sleep1_nose", TYPE_MISC, BOTH_SLEEP1_NOSE, BOTH_SLEEP1, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sleep1_getup", TYPE_MISC, BOTH_SLEEP1GETUP, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sleep2", TYPE_MISC, BOTH_SLEEP2, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sleep2_shift", TYPE_MISC, BOTH_SLEEP2_SHIFT, BOTH_SLEEP2, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sleep2_getup", TYPE_MISC, BOTH_SLEEP2GETUP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "sleep3", TYPE_MISC, BOTH_SLEEP3, NULL_ANIM, DEAD_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "sleep3getup", TYPE_MISC, BOTH_SLEEP3GETUP, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "snapto1", TYPE_FULLBODY, BOTH_SNAPTO1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "snapto2", TYPE_FULLBODY, BOTH_SNAPTO2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random1", TYPE_GESTURE, BOTH_STAND1_RANDOM2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random2", TYPE_GESTURE, BOTH_STAND1_RANDOM3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random3", TYPE_GESTURE, BOTH_STAND1_RANDOM4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random4", TYPE_GESTURE, BOTH_STAND1_RANDOM5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random5", TYPE_GESTURE, BOTH_STAND1_RANDOM6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random6", TYPE_GESTURE, BOTH_STAND1_RANDOM7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random7", TYPE_GESTURE, BOTH_STAND1_RANDOM8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random8", TYPE_GESTURE, BOTH_STAND1_RANDOM9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random9", TYPE_GESTURE, BOTH_STAND1_RANDOM10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand1_random10", TYPE_GESTURE, BOTH_STAND1_RANDOM11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random1", TYPE_GESTURE, BOTH_STAND2_RANDOM1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random2", TYPE_GESTURE, BOTH_STAND2_RANDOM2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random3", TYPE_GESTURE, BOTH_STAND2_RANDOM3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random4", TYPE_GESTURE, BOTH_STAND2_RANDOM4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random5", TYPE_GESTURE, BOTH_STAND2_RANDOM5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random6", TYPE_GESTURE, BOTH_STAND2_RANDOM6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random7", TYPE_GESTURE, BOTH_STAND2_RANDOM7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random8", TYPE_GESTURE, BOTH_STAND2_RANDOM8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random9", TYPE_GESTURE, BOTH_STAND2_RANDOM9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random10", TYPE_GESTURE, BOTH_STAND2_RANDOM10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random11", TYPE_GESTURE, BOTH_STAND2_RANDOM11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand2_random12", TYPE_GESTURE, BOTH_STAND2_RANDOM12, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, + { "stand3", TYPE_MISC, BOTH_STAND3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "standup1", TYPE_FULLBODY, BOTH_STANDUP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "surprised1", TYPE_FULLBODY, BOTH_SURPRISED1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, + { "surprised2", TYPE_FULLBODY, BOTH_SURPRISED2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, + { "surprised3", TYPE_FULLBODY, BOTH_SURPRISED3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, + { "surprised4", TYPE_FULLBODY, BOTH_SURPRISED4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH }, + { "surprised5", TYPE_FULLBODY, BOTH_SURPRISED5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER }, + { "table_eat1", TYPE_MISC, BOTH_TABLE_EAT1, BOTH_TABLE_IDLE1, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "table_getup1", TYPE_MISC, BOTH_TABLE_GETUP1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "table_idle1", TYPE_MISC, BOTH_TABLE_IDLE1, NULL_ANIM, SITTING_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "table_talkgesture1", TYPE_MISC, BOTH_TABLE_TALKGESTURE1, BOTH_TABLE_IDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_UPPER }, + { "talkgesture1", TYPE_GESTURE, BOTH_TALKGESTURE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_DEFAULT, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "talkgesture2", TYPE_GESTURE, BOTH_TALKGESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "talkgesture3", TYPE_GESTURE, TORSO_TALKGESTURE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "talkgesture4", TYPE_GESTURE, TORSO_TALKGESTURE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "writhing2", TYPE_FULLBODY, BOTH_WRITHING2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_BOTH, EMOTE_CLAMP_BODY | EMOTE_OVERRIDE_BOTH | EMOTE_LOOP_BOTH }, + { "combadge1", TYPE_GESTURE, TORSO_COMBADGE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "combadge2", TYPE_GESTURE, TORSO_COMBADGE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "combadge3", TYPE_GESTURE, TORSO_COMBADGE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "combadge4", TYPE_GESTURE, TORSO_COMBADGE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "equipment1", TYPE_GESTURE, TORSO_EQUIPMENT1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "equipment2", TYPE_GESTURE, TORSO_EQUIPMENT2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "equipment3", TYPE_GESTURE, TORSO_EQUIPMENT3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "grablbackl", TYPE_GESTURE, TORSO_GRABLBACKL, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "hand1", TYPE_GESTURE, TORSO_HAND1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "hand2", TYPE_GESTURE, TORSO_HAND2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture1", TYPE_GESTURE, TORSO_HANDGESTURE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture2", TYPE_GESTURE, TORSO_HANDGESTURE2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture3", TYPE_GESTURE, TORSO_HANDGESTURE3, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture4", TYPE_GESTURE, TORSO_HANDGESTURE4, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture5", TYPE_GESTURE, TORSO_HANDGESTURE5, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture6", TYPE_GESTURE, TORSO_HANDGESTURE6, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture7", TYPE_GESTURE, TORSO_HANDGESTURE7, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture8", TYPE_GESTURE, TORSO_HANDGESTURE8, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture9", TYPE_GESTURE, TORSO_HANDGESTURE9, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture10", TYPE_GESTURE, TORSO_HANDGESTURE10, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture11", TYPE_GESTURE, TORSO_HANDGESTURE11, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture12", TYPE_GESTURE, TORSO_HANDGESTURE12, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "handgesture13", TYPE_GESTURE, TORSO_HANDGESTURE13, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "hypospray", TYPE_GESTURE, TORSO_HYPOSPRAY1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "pokeridle1", TYPE_GESTURE, TORSO_POKERIDLE1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, + { "pokeridle2", TYPE_GESTURE, TORSO_POKERIDLE2, TORSO_POKERIDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER }, + { "pokeridle3", TYPE_GESTURE, TORSO_POKERIDLE3, TORSO_POKERIDLE1, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "shout1", TYPE_GESTURE, TORSO_SHOUT1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, + { "speechless1", TYPE_GESTURE, TORSO_SPEECHLESS1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, + { "speechless2", TYPE_GESTURE, TORSO_SPEECHLESS2, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_LOOP_UPPER }, + { "taunt", TYPE_GESTURE, TORSO_GESTURE, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, + { "wrist1", TYPE_GESTURE, TORSO_WRIST1, NULL_ANIM, STAND_VIEWHEIGHT, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, }; - //{ "gesture1", BOTH_GESTURE1, NULL_ANIM, 0, 0, MOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - //{ "stand1_random1", BOTH_STAND1_RANDOM1, NULL_ANIM, 0, 0, EMOTE_BOTH, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_BOTH }, - //{ "talkgesture5", TORSO_TALKGESTURE6, NULL_ANIM, 0, HITBOX_NULL, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - //{ "headshake1", TORSO_HEADSHAKE1, NULL_ANIM, 0, 0, EMOTE_UPPER, EMOTE_OVERRIDE_UPPER | EMOTE_REVERTLOOP_UPPER }, - - -//TiM : Hrmm... this may have been why it was crashing on some people's PCs... -//Let's try the old fashioned way... -//int bg_numEmotes = sizeof( emoteList ) / sizeof ( emoteList[0] ); +/* + * TiM : Hrmm... this may have been why it was crashing on some people's PCs... + *Let's try the old fashioned way... + * int bg_numEmotes = sizeof( emoteList ) / sizeof ( emoteList[0] ); + */ int bg_numEmotes = 180; -//TiM: -//!In order to set up a list of items we can use in the 'give' command. +/* + * TiM: + * !In order to set up a list of items we can use in the 'give' command. + * */ giveItem_t bg_giveItem[] = { //consoleName giveType giveValue { "all", TYPE_ALL, 0 }, @@ -1101,7 +959,7 @@ giveItem_t bg_giveItem[] = { { "god", TYPE_POWERUP, 0 } }; -//TiM - Meh... just define the number... doing fancy array stuff seems to make PCs 'splode O_o +/* TiM - Meh... just define the number... doing fancy array stuff seems to make PCs 'splode O_o */ int bg_numGiveItems = 24; /** @@ -1188,8 +1046,6 @@ gitem_t *BG_FindItemForHoldable( holdable_t pw ) { */ gitem_t *BG_FindItemForWeapon( weapon_t weapon ) { gitem_t *it; - //if(ent->client->sess.sessionClass){ - //} for ( it = bg_itemlist + 1 ; it->classname ; it++) { if ( it->giType == IT_WEAPON && it->giTag == weapon ) { return it; @@ -1225,7 +1081,7 @@ gitem_t *BG_FindItem( const char *pickupName/*const char *classname*/ ) { gitem_t *it; for ( it = bg_itemlist + 1 ; it->classname ; it++ ) { - if ( !Q_stricmp( it->pickup_name, pickupName )/*!Q_stricmp( it->classname, classname)*/ )//RPG-X: RedTechie - Trying to fix give cmd + if ( !Q_stricmp( it->pickup_name, pickupName )/*!Q_stricmp( it->classname, classname)*/ ) /* RPG-X: RedTechie - Trying to fix give cmd */ return it; } @@ -1243,7 +1099,7 @@ qboolean BG_PlayerTouchesItem( playerState_t *ps, entityState_t *item, int atTim BG_EvaluateTrajectory( &item->pos, atTime, origin ); - // we are ignoring ducked differences here + /* we are ignoring ducked differences here */ if ( ps->origin[0] - origin[0] > 44 || ps->origin[0] - origin[0] < -50 || ps->origin[1] - origin[1] > 36 @@ -1269,168 +1125,21 @@ qboolean BG_CanItemBeGrabbed( const entityState_t *ent, const playerState_t *ps, gitem_t *item; //_______________________________________________________________ -/* SYNC with g_items global var -int Max_Ammo[WP_NUM_WEAPONS] = -{ - 0, // WP_NONE, - 50, // WP_PHASER, !! this should match PHASER_AMMO_MAX defined in bg_public - 128, // WP_COMPRESSION_RIFLE, - 60, // WP_NULL_HAND, - 100, // WP_COFFEE, - 50, // WP_DISRUPTOR, - 30, // WP_GRENADE_LAUNCHER, - 120, // WP_TR116, - 20, // WP_QUANTUM_BURST, - 120, // WP_DERMAL_REGEN, - 100, // WP_VOYAGER_HYPO, - 100, // WP_TOOLKIT, - 100 // WP_MEDKIT - -}; -//_______________________________________________________________ -*/ if ( ent->modelindex < 1 || ent->modelindex >= bg_numItems ) { - //Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: index out of range" ); - //Com_Printf ("BG_CanItemBeGrabbed: index out of range\n"); + /*Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: index out of range" ); + Com_Printf ("BG_CanItemBeGrabbed: index out of range\n");*/ return qfalse; } - // The player used to not be able to pickup stuff when ghosted. Now it automatically unghosts them. - //RPG-X: RedTechie - No we want to keep ghost >:) - /*if (ps->powerups[PW_GHOST]) - { - return qfalse; - }*/ - item = &bg_itemlist[ent->modelindex]; - //if ( ps->persistant[PERS_CLASS] == PC_BORG && item->giType != IT_TEAM )//FIXME: check for pModAssimilation mode being on - //{//borg cannot pick up anything but flags - // return qfalse; - //} - - // Marcin| 30/12/2008 + /* Marcin| 30/12/2008 */ if (ps->ammo[item->giTag] >= maxWeap) { return qfalse; } else { return qtrue; } - - //unused: --> so why it is not commented out? - -/* switch( item->giType ) - { - case IT_WEAPON: - if ( ( ps->stats[STAT_WEAPONS] & (1 << item->giTag) ) ) // RPG-X | Marcin | 04/12/2008 - { - return qfalse; - } - return qtrue; - - case IT_AMMO: - if ( ps->ammo[ item->giTag ] >= Max_Ammo[ item->giTag ]) { - return qfalse; // can't hold any more - } - //if ( ps->persistant[PERS_CLASS] != PC_NOCLASS )//FIXME: should be checking g_pModSpecialties->integer != 0 ) - //{ - // if ( ps->persistant[PERS_CLASS] != PC_ACTIONHERO ) - // { - // //only pick it up if you have the weapon - // if ( !(ps->stats[STAT_WEAPONS]&(1<giTag)) ) - // {//don't have the weapon that uses this ammo - // return qfalse; - // } - // } - //} - return qtrue; - - case IT_ARMOR: - // we also clamp armor to the maxhealth for handicapping - if ( ps->stats[STAT_ARMOR] >= ps->stats[STAT_MAX_HEALTH] * 2 ) { - return qfalse; - } - return qtrue; - - case IT_HEALTH: - // small and mega healths will go over the max, otherwise - // don't pick up if already at max - if ( item->quantity == 5 || item->quantity == 100 ) { - if ( ps->stats[STAT_HEALTH] >= ps->stats[STAT_MAX_HEALTH] * 2 ) { - return qfalse; - } - return qtrue; - } - - if ( ps->stats[STAT_HEALTH] >= ps->stats[STAT_MAX_HEALTH] ) { - return qfalse; - } - return qtrue; - - case IT_POWERUP: - //if ( ps->persistant[PERS_CLASS] == PC_ACTIONHERO ) - //{ - // if ( item->giTag == PW_LASER ) - // { - // return qfalse; - // } - //} - //else if ( ps->persistant[PERS_CLASS] != PC_NOCLASS )//FIXME: should be checking g_pModSpecialties->integer != 0 ) - //{//in specialty mode, only certain classes can use certain powerups - // //FIXME: breaks bots! - // switch( item->giTag ) - // { - // case PW_QUAD: - // if ( ps->persistant[PERS_CLASS] != PC_HEAVY ) - // { - // return qfalse; - // } - // break; - // case PW_BOLTON: - // if ( ps->persistant[PERS_CLASS] != PC_MEDIC ) - // { - // return qfalse; - // } - // break; - // case PW_FLIGHT: - // if ( ps->persistant[PERS_CLASS] != PC_INFILTRATOR ) - // { - // return qfalse; - // } - // break; - // } - //} - return qtrue; // powerups are always picked up - - case IT_TEAM: // team items, such as flags - // ent->modelindex2 is non-zero on items if they are dropped - // we need to know this because we can pick up our dropped flag (and return it) - // but we can't pick up our flag at base - if (ps->persistant[PERS_TEAM] == TEAM_RED) { - //if (item->giTag == PW_BORG_ADAPT || - // (item->giTag == PW_REDFLAG && ent->modelindex2) || - // (item->giTag == PW_REDFLAG && ps->powerups[PW_BORG_ADAPT])) - // return qtrue; - } else if (ps->persistant[PERS_TEAM] == TEAM_BLUE) { - //if (item->giTag == PW_REDFLAG || - // (item->giTag == PW_BORG_ADAPT && ent->modelindex2) || - // (item->giTag == PW_BORG_ADAPT && ps->powerups[PW_REDFLAG])) - // return qtrue; - } - return qfalse; - - case IT_HOLDABLE: - // can only hold one item at a time - if ( ps->stats[STAT_HOLDABLE_ITEM] ) { - return qfalse; - } - return qtrue; - - case IT_BAD: - Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: IT_BAD" ); - } - - return qfalse; */ } //====================================================================== @@ -1448,7 +1157,7 @@ void BG_EvaluateTrajectory( const trajectory_t *tr, int atTime, vec3_t result ) VectorCopy( tr->trBase, result ); break; case TR_LINEAR: - deltaTime = ( atTime - tr->trTime ) * 0.001; // milliseconds to seconds + deltaTime = ( atTime - tr->trTime ) * 0.001; /* milliseconds to seconds */ VectorMA( tr->trBase, deltaTime, tr->trDelta, result ); break; case TR_SINE: @@ -1460,16 +1169,16 @@ void BG_EvaluateTrajectory( const trajectory_t *tr, int atTime, vec3_t result ) if ( atTime > tr->trTime + tr->trDuration ) { atTime = tr->trTime + tr->trDuration; } - deltaTime = ( atTime - tr->trTime ) * 0.001; // milliseconds to seconds + deltaTime = ( atTime - tr->trTime ) * 0.001; /* milliseconds to seconds */ if ( deltaTime < 0 ) { deltaTime = 0; } VectorMA( tr->trBase, deltaTime, tr->trDelta, result ); break; case TR_GRAVITY: - deltaTime = ( atTime - tr->trTime ) * 0.001; // milliseconds to seconds + deltaTime = ( atTime - tr->trTime ) * 0.001; /* milliseconds to seconds */ VectorMA( tr->trBase, deltaTime, tr->trDelta, result ); - result[2] -= 0.5 * DEFAULT_GRAVITY * deltaTime * deltaTime; // FIXME: local gravity... + result[2] -= 0.5 * DEFAULT_GRAVITY * deltaTime * deltaTime; /* FIXME: local gravity... */ break; default: Com_Error( ERR_DROP, "BG_EvaluateTrajectory: unknown trType: %i", tr->trTime ); @@ -1494,7 +1203,7 @@ void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t resu break; case TR_SINE: deltaTime = ( atTime - tr->trTime ) / (float) tr->trDuration; - phase = cos( deltaTime * M_PI * 2 ); // derivative of sin = cos + phase = cos( deltaTime * M_PI * 2 ); /* derivative of sin = cos */ phase *= 0.5; VectorScale( tr->trDelta, phase, result ); break; @@ -1506,9 +1215,9 @@ void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t resu VectorCopy( tr->trDelta, result ); break; case TR_GRAVITY: - deltaTime = ( atTime - tr->trTime ) * 0.001; // milliseconds to seconds + deltaTime = ( atTime - tr->trTime ) * 0.001; /* milliseconds to seconds */ VectorCopy( tr->trDelta, result ); - result[2] -= DEFAULT_GRAVITY * deltaTime; // FIXME: local gravity... + result[2] -= DEFAULT_GRAVITY * deltaTime; /* FIXME: local gravity... */ break; default: Com_Error( ERR_DROP, "BG_EvaluateTrajectoryDelta: unknown trType: %i", tr->trTime ); @@ -1537,14 +1246,14 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean char medicrevive[32]; int medicrevive_int; - //RPG-X: RedTechie - Attempted to fix player going invisible now they just dont go invisible (me being picky) a player is never going to notice this + /* RPG-X: RedTechie - Attempted to fix player going invisible now they just dont go invisible (me being picky) a player is never going to notice this */ trap_Cvar_VariableStringBuffer( "rpg_medicsrevive", medicrevive, 32 ); medicrevive_int = atoi(medicrevive); if ( ps->pm_type == PM_INTERMISSION || ps->pm_type == PM_SPECTATOR ) { s->eType = ET_INVISIBLE; } else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) { if(medicrevive_int == 1){ - s->eType = ET_PLAYER; //RPG-X: RedTechie - No gibbing! Before it was s->eType = ET_INVISIBLE; + s->eType = ET_PLAYER; /* RPG-X: RedTechie - No gibbing! Before it was s->eType = ET_INVISIBLE; */ }else{ s->eType = ET_INVISIBLE; } @@ -1560,7 +1269,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean SnapVector( s->pos.trBase ); } - //TiM - Get velocity as well + /* TiM - Get velocity as well */ VectorCopy( ps->velocity, s->pos.trDelta ); if ( snap ) { @@ -1575,33 +1284,31 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean s->angles2[YAW] = ps->movementDir; - //TiM + /* TiM */ s->torsoAnim = ps->stats[TORSOANIM]; s->legsAnim = ps->stats[LEGSANIM]; - - //s->legsAnim = ps->legsAnim; - //s->torsoAnim = ps->torsoAnim; - - //TiM : Mental note : DON'T FREEAKIN ACCIDENTLY COMMENT THIS OUT AGAIN! IT'S KINDA IMPORTANT!!!!!!!!!!!!!!!! - s->clientNum = ps->clientNum; // ET_PLAYER looks here instead of at number - // so corpses can also reference the proper config + + /* TiM : Mental note : DON'T FREEAKIN ACCIDENTLY COMMENT THIS OUT AGAIN! IT'S KINDA IMPORTANT!!!!!!!!!!!!!!!! */ + s->clientNum = ps->clientNum; /* ET_PLAYER looks here instead of at number + so corpses can also reference the proper config*/ s->eFlags = ps->eFlags; if ( ( !medicrevive_int && ps->stats[STAT_HEALTH] <= 0 ) || ( medicrevive_int > 0 && ps->stats[STAT_HEALTH] <= 1 ) ) - { //RPG-X: TiM: Bah Red... u gotta account for these flags with ur system - s->eFlags |= EF_DEAD; //or it screws up the model system + { /* RPG-X: TiM: Bah Red... u gotta account for these flags with ur system */ + s->eFlags |= EF_DEAD; /* or it screws up the model system */ } else { s->eFlags &= ~EF_DEAD; } - //========================================================================== - //TiM: ^&$*#^^.... T_T - //Okay it's official. eFlags is buggy. Turns out the Ravensoft programmers were - //wreaking grief with it too. :P - //Although hacky, transposing these flags here is the only way I know to get this data from G to CG. + /*========================================================================== + * TiM: ^&$*#^^.... T_T + * Okay it's official. eFlags is buggy. Turns out the Ravensoft programmers were + * wreaking grief with it too. :P + * Although hacky, transposing these flags here is the only way I know to get this data from G to CG. + */ - //Clamp body (not head) flag + /* Clamp body (not head) flag */ if ( ps->stats[EMOTES] & EMOTE_CLAMP_BODY ) { s->eFlags |= EF_CLAMP_BODY; } @@ -1609,7 +1316,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean s->eFlags &= ~EF_CLAMP_BODY; } - //Clamp whole body flags + /* Clamp whole body flags */ if ( ps->stats[EMOTES] & EMOTE_CLAMP_ALL ) { s->eFlags |= EF_CLAMP_ALL; } @@ -1620,7 +1327,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean if ( ps->stats[EMOTES] & EMOTE_EYES_SHUT ) { s->eFlags |= EF_EYES_SHUT; - //Com_Printf( "Eyes were shutted.\n" ); + /* Com_Printf( "Eyes were shutted.\n" ); */ } else { s->eFlags &= ~EF_EYES_SHUT; @@ -1633,7 +1340,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean s->eFlags &= ~EF_EYES_ANGRY; } - //========================================================================== + /*==========================================================================*/ if ( ps->externalEvent ) { s->event = ps->externalEvent; @@ -1672,7 +1379,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean s->eFlags &= ~EF_FULL_ROTATE; } - //TiM: Extra - Transmit the weapons stats as a flag for the 'equip' command + /* TiM: Extra - Transmit the weapons stats as a flag for the 'equip' command */ s->time2 = ps->stats[STAT_WEAPONS]; } @@ -1726,7 +1433,7 @@ const char *itemnames[MAX_ITEMNAMES] = "HOLDABLE_DETPACK", "ITEM_SEEKER", "HOLDABLE_SHIELD", -"HOLOGRAPHIC_DECOY", // decoy temp +"HOLOGRAPHIC_DECOY", /* decoy temp */ "WEAPON_TR116", @@ -1734,7 +1441,7 @@ NULL }; -#define MAX_ITEMNAMEFILE 10000 //5000 har har +#define MAX_ITEMNAMEFILE 10000 /* 5000 har har */ char itemNameBuffer[MAX_ITEMNAMEFILE]; /** @@ -1764,8 +1471,8 @@ void BG_ParseItemsText(char *buff) len = strlen(token); if (len) { - bg_itemlist[i].pickup_name = (buffer - (len + 1)); // The +1 is to get rid of the " at the beginning of the sting. - *(buffer - 1) = '\0'; // Place an string end where is belongs. + bg_itemlist[i].pickup_name = (buffer - (len + 1)); /* The +1 is to get rid of the " at the beginning of the sting. */ + *(buffer - 1) = '\0'; /* Place an string end where is belongs. */ } } @@ -1787,7 +1494,7 @@ void BG_LanguageFilename(char *baseName,char *baseExtension,char *finalName) trap_Cvar_VariableStringBuffer( "g_language", language, 32 ); - // If it's English then no extension + /* If it's English then no extension */ if (language[0]=='\0' || Q_stricmp ("ENGLISH",language)==0) { Com_sprintf(finalName,MAX_QPATH,"%s.%s",baseName,baseExtension); @@ -1796,12 +1503,12 @@ void BG_LanguageFilename(char *baseName,char *baseExtension,char *finalName) { Com_sprintf(finalName,MAX_QPATH,"%s_%s.%s",baseName,language,baseExtension); - //Attempt to load the file + /* Attempt to load the file */ trap_FS_FOpenFile( finalName, &file, FS_READ ); - if ( file == 0 ) // This extension doesn't exist, go English. + if ( file == 0 ) /* This extension doesn't exist, go English. */ { - Com_sprintf(finalName,MAX_QPATH,"%s.%s",baseName,baseExtension); //the caller will give the error if this isn't there + Com_sprintf(finalName,MAX_QPATH,"%s.%s",baseName,baseExtension); /* the caller will give the error if this isn't there */ } else { @@ -1835,7 +1542,7 @@ void BG_LoadItemNames(void) return; } - // initialise the data area + /* initialise the data area */ memset(itemNameBuffer, 0, sizeof(itemNameBuffer)); trap_FS_Read( itemNameBuffer, len, f ); @@ -1852,19 +1559,19 @@ void BG_LoadItemNames(void) */ #ifdef Q3_VM static gender_t G_ParseAnimationFileSex( const char *filename) { - char *text_p; - int len; - char *token; - char text[20000]; + char *text_p; + int len; + char *token; + char text[20000]; fileHandle_t f; - char animfile[MAX_QPATH]; + char animfile[MAX_QPATH]; - //strcpy(animfile, filename); + /* strcpy(animfile, filename); */ Q_strncpyz(animfile, filename, sizeof(animfile)); len = strlen(animfile); strcpy(&animfile[len-strlen("groups.cfg")], "animation.cfg"); - // load the file + /* load the file */ len = trap_FS_FOpenFile( animfile, &f, FS_READ ); if ( len <= 0 ) { return GENDER_NEUTER; @@ -1878,10 +1585,10 @@ static gender_t G_ParseAnimationFileSex( const char *filename) { text[len] = 0; trap_FS_FCloseFile( f ); - // parse the text + /* parse the text */ text_p = text; - // read optional parameters + /* read optional parameters */ while ( 1 ) { token = COM_Parse( &text_p ); if ( !token[0] ) { @@ -1905,19 +1612,19 @@ static gender_t G_ParseAnimationFileSex( const char *filename) { } #else static gender_t G_ParseAnimationFileSex( const char *filename) { - char *text_p; - int len; - char *token; - char *text; + char *text_p; + int len; + char *token; + char *text; fileHandle_t f; - char animfile[MAX_QPATH]; + char animfile[MAX_QPATH]; - //strcpy(animfile, filename); + /* strcpy(animfile, filename); */ Q_strncpyz(animfile, filename, sizeof(animfile)); len = strlen(animfile); strcpy(&animfile[len-strlen("groups.cfg")], "animation.cfg"); - // load the file + /* load the file */ len = trap_FS_FOpenFile( animfile, &f, FS_READ ); if ( len <= 0 ) { return GENDER_NEUTER; @@ -1939,10 +1646,10 @@ static gender_t G_ParseAnimationFileSex( const char *filename) { text[len] = 0; trap_FS_FCloseFile( f ); - // parse the text + /* parse the text */ text_p = text; - // read optional parameters + /* read optional parameters */ while ( 1 ) { token = COM_Parse( &text_p ); if ( !token[0] ) { @@ -1975,20 +1682,20 @@ static gender_t G_ParseAnimationFileSex( const char *filename) { */ #define MAX_GROUP_FILE_SIZE 5000 char* BG_RegisterRace( const char *name ) { - char *text_p; - char *token; - int len; + char *text_p; + char *token; + int len; fileHandle_t f; - char text[MAX_GROUP_FILE_SIZE]; - gender_t theSex; + char text[MAX_GROUP_FILE_SIZE]; + gender_t theSex; memset (races, 0, sizeof(races)); memset (text, 0, sizeof(text)); - // load and parse the skin file + /* load and parse the skin file */ len = trap_FS_FOpenFile( name, &f, FS_READ ); if ( !f ) { - // if we didn't get a races file, use an empty one. + /* if we didn't get a races file, use an empty one. */ Com_sprintf(races, sizeof(races), "unknown"); return races; } @@ -2011,21 +1718,21 @@ char* BG_RegisterRace( const char *name ) { text_p = text; while ( *text_p ) { - // get surface name + /* get surface name */ token = COM_Parse( &text_p ); if ( !token[0] ) { break; } - // if we about to break the races size list then dump us out + /* if we about to break the races size list then dump us out */ if (strlen(races) + strlen(token) > 256) { break; } - // add it into the race list + /* add it into the race list */ strcat(races, token); - // put a comma between the names + /* put a comma between the names */ strcat(races, ","); if ( *text_p == ',' ) { @@ -2034,7 +1741,7 @@ char* BG_RegisterRace( const char *name ) { if (!Q_stricmp ("borg", token) ) { if (theSex == GENDER_MALE) { - // add it into the race list + /* add it into the race list */ strcat(races, "BorgMale,"); } else if (theSex == GENDER_FEMALE) { strcat(races, "BorgFemale,"); @@ -2044,13 +1751,13 @@ char* BG_RegisterRace( const char *name ) { } - // just in case + /* just in case */ if (!races[0]) { Com_sprintf(races, sizeof(races), "unknown"); } else - { //lose the last comma + { /* lose the last comma */ races[strlen(races)-1] = 0; } @@ -2105,12 +1812,12 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { return qfalse; } - //Parse out the default cell. Default has no names anyway, - //but in case a n00bie modder put names in anyway. + /* Parse out the default cell. Default has no names anyway, + but in case a n00bie modder put names in anyway. */ SkipBracedSection( &textPtr ); while( 1 ) { - //lastPtr = textPtr; + /* lastPtr = textPtr; */ token = COM_Parse( &textPtr ); if( !token[0] ) { break; @@ -2120,7 +1827,7 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { break; } - //If we hit an open brace (ie, assuming we hit the start of a new rank cell) + /* If we hit an open brace (ie, assuming we hit the start of a new rank cell) */ if ( !Q_stricmpn( token, "{", 1 ) ) { while ( 1 ) { token = COM_Parse( &textPtr ); @@ -2128,7 +1835,7 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { break; } - //We hit a MenuTexture entry, since this uses { symbols, we'll skip these to stop errors. + /* We hit a MenuTexture entry, since this uses { symbols, we'll skip these to stop errors. */ if ( !Q_stricmpn( token, "MenuTexture", 11 ) ) { SkipRestOfLine( &textPtr ); continue; @@ -2152,13 +1859,13 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { continue; } - //We hit the end of the cell. + /* We hit the end of the cell. */ else if ( !Q_stricmpn( token, "}", 1 ) ) { break; } } - //Error check. If we didn't get both a formal and console name, pwn the caller. ;P + /* Error check. If we didn't get both a formal and console name, pwn the caller. ;P */ if ( !rankNames[i].consoleName[0] || !rankNames[i].formalName[0] ) { Com_Printf( S_COLOR_RED "One or more rank names were not found in rank#: %i\n", i ); return qfalse; @@ -2225,8 +1932,8 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { return qfalse; } - //Parse out the default cell. Default has no names anyway, - //but in case a n00bie modder put names in anyway. + /* Parse out the default cell. Default has no names anyway, + but in case a n00bie modder put names in anyway. */ SkipBracedSection( &textPtr ); while( 1 ) { @@ -2240,7 +1947,7 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { break; } - //If we hit an open brace (ie, assuming we hit the start of a new rank cell) + /* If we hit an open brace (ie, assuming we hit the start of a new rank cell) */ if ( !Q_stricmpn( token, "{", 1 ) ) { while ( 1 ) { token = COM_Parse( &textPtr ); @@ -2248,7 +1955,7 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { break; } - //We hit a MenuTexture entry, since this uses { symbols, we'll skip these to stop errors. + /* We hit a MenuTexture entry, since this uses { symbols, we'll skip these to stop errors. */ if ( !Q_stricmpn( token, "MenuTexture", 11 ) ) { SkipRestOfLine( &textPtr ); continue; @@ -2272,13 +1979,13 @@ qboolean BG_ParseRankNames( char* fileName, rankNames_t rankNames[] ) { continue; } - //We hit the end of the cell. + /* We hit the end of the cell. */ else if ( !Q_stricmpn( token, "}", 1 ) ) { break; } } - //Error check. If we didn't get both a formal and console name, pwn the caller. ;P + /* Error check. If we didn't get both a formal and console name, pwn the caller. ;P */ if ( !rankNames[i].consoleName[0] || !rankNames[i].formalName[0] ) { Com_Printf( S_COLOR_RED "One or more rank names were not found in rank#: %i\n", i ); return qfalse; @@ -2304,11 +2011,11 @@ char *NextWordEndsHere(char *p) return p; } - while (*p && *p == ' ') { // first pass + while (*p && *p == ' ') { /* first pass */ ++p; } - while (*p && *p != ' ') { // second pass + while (*p && *p != ' ') { /* second pass */ ++p; } diff --git a/game/q_shared.h b/game/q_shared.h index c066c29..b8578f1 100644 --- a/game/q_shared.h +++ b/game/q_shared.h @@ -244,30 +244,6 @@ typedef int clipHandle_t; #define MAX_NAME_LENGTH 32 // max length of a client name -//client->sess.sessionClass and client->ps.persistant[PERS_CLASS] -/*typedef enum -{//FIXME: restrict pickups to the proper PC? - PC_NOCLASS,//default - PC_INFILTRATOR,//fast, low attack - PC_SNIPER,//sneaky, snipe only - PC_HEAVY,//slow, heavy attack - PC_DEMO,//go boom - PC_MEDIC,//heal - PC_TECH,//operate - PC_BORG,//special weapons, slower, adapting shields - PC_ACTIONHERO,//has everything - PC_SECURITY,//for escorts - PC_MEDICAL,//for escorts - PC_COMMAND,//for escorts - PC_SCIENCE,//for escorts - PC_ENGINEER,//for escorts - PC_ALIEN,//for escorts - PC_ALPHAOMEGA22,//for escorts - PC_ADMIN,//for escorts - PC_N00B,//for escorts - NUM_PLAYER_CLASSES -} pclass_t;*/ - typedef int pclass_t; // paramters for command buffer stuffing