Merge pull request #24 from ScatterBox/main

This commit is contained in:
Ian 2023-01-22 19:50:07 -05:00 committed by GitHub
commit eff6cb5138
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -72,7 +72,7 @@ void end_sys_globals; // flag for structure dumping
.string model; .string model;
.float frame; .float frame;
.float skin; .float skin;
//.float iframetime; .float iframetime;
.float effects; .float effects;
.vector mins, maxs; // bounding box extents reletive to origin .vector mins, maxs; // bounding box extents reletive to origin
.vector size; // maxs - mins .vector size; // maxs - mins
@ -140,7 +140,7 @@ void end_sys_globals; // flag for structure dumping
.string targetname; .string targetname;
.float dmg_take; .float dmg_take;
.float dmg_save; .float dmg_save;
//.float bleed_out; .float bleed_out;
.float progress_bar; .float progress_bar;
.entity dmg_inflictor; .entity dmg_inflictor;
.entity owner; // who launched a missile .entity owner; // who launched a missile
@ -150,7 +150,7 @@ void end_sys_globals; // flag for structure dumping
.string noise, noise1, noise2, noise3; // contains names of wavs to play .string noise, noise1, noise2, noise3; // contains names of wavs to play
.float x2_icon; // double points icon .float x2_icon; // double points icon
.float insta_icon; .float insta_icon;
//.string Weapon_Name; .string Weapon_Name;
.string Weapon_Name_Touch; .string Weapon_Name_Touch;
.vector ADS_Offset; .vector ADS_Offset;
.vector Flash_Offset; .vector Flash_Offset;
@ -490,6 +490,5 @@ string(float num)
#define FILE_APPEND 1 #define FILE_APPEND 1
#define FILE_WRITE 2 #define FILE_WRITE 2
.string Weapon_Name;
string CMD_STRING; string CMD_STRING;
void (vector o, vector d, float color, float count) particle = {}; void (vector o, vector d, float color, float count) particle = {};