zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tiny cleanups

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7202 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-11-18 18:11:27 +00:00
parent 32057d2e19
commit a7a1ada83d
3 changed files with 87 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/duke3d/src/gameexec.cpp
View file

@ -263,19 +263,21 @@ static int32_t VM_CheckSquished(void)
#endif #endif
if (vm.pSprite->pal == 1 ? (floorZ - ceilZ >= ZOFFSET5 || (pSector->lotag & 32768u)) : (floorZ - ceilZ >= ZOFFSET4)) if (vm.pSprite->pal == 1 ? (floorZ - ceilZ >= ZOFFSET5 || (pSector->lotag & 32768u)) : (floorZ - ceilZ >= ZOFFSET4))
return 0; return 0;
P_DoQuote(QUOTE_SQUISHED, vm.pPlayer); P_DoQuote(QUOTE_SQUISHED, vm.pPlayer);
if (A_CheckEnemySprite(vm.pSprite)) if (A_CheckEnemySprite(vm.pSprite))
vm.pSprite->xvel = 0; vm.pSprite->xvel = 0;
#ifndef EDUKE32_STANDALONE
if (EDUKE32_PREDICT_FALSE(vm.pSprite->pal == 1)) // frozen if (EDUKE32_PREDICT_FALSE(vm.pSprite->pal == 1)) // frozen
{ {
vm.pActor->picnum = SHOTSPARK1; vm.pActor->picnum = SHOTSPARK1;
vm.pActor->extra = 1; vm.pActor->extra = 1;
return 0; return 0;
} }
#endif
return 1; return 1;
} }
@ -296,8 +298,8 @@ GAMEEXEC_STATIC GAMEEXEC_INLINE void P_ForceAngle(DukePlayer_t *pPlayer)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
int32_t A_Dodge(spritetype * const); bool A_Dodge(spritetype * const);
int32_t A_Dodge(spritetype * const pSprite) bool A_Dodge(spritetype * const pSprite)
{ {
if (A_CheckEnemySprite(pSprite) && pSprite->extra <= 0) // hack if (A_CheckEnemySprite(pSprite) && pSprite->extra <= 0) // hack
return 0; return 0;
@ -325,16 +327,16 @@ int32_t A_Dodge(spritetype * const pSprite)
return 0; return 0;
} }
int32_t A_GetFurthestAngle(int const spriteNum, int const angDiv) int A_GetFurthestAngle(int spriteNum, int angDiv)
{ {
uspritetype *const pSprite = (uspritetype *)&sprite[spriteNum]; auto const pSprite = (uspritetype *)&sprite[spriteNum];
if (pSprite->picnum != APLAYER && (AC_COUNT(actor[spriteNum].t_data)&63) > 2) if (pSprite->picnum != APLAYER && (AC_COUNT(actor[spriteNum].t_data)&63) > 2)
return pSprite->ang + 1024; return pSprite->ang + 1024;
int32_t furthestAngle = 0; int furthestAngle = 0;
int32_t greatestDist = INT32_MIN;
int const angIncs = tabledivide32_noinline(2048, angDiv); int const angIncs = tabledivide32_noinline(2048, angDiv);
int32_t greatestDist = INT32_MIN;
hitdata_t hit; hitdata_t hit;
for (native_t j = pSprite->ang; j < (2048 + pSprite->ang); j += angIncs) for (native_t j = pSprite->ang; j < (2048 + pSprite->ang); j += angIncs)
@ -352,7 +354,7 @@ int32_t A_GetFurthestAngle(int const spriteNum, int const angDiv)
} }
} }
return furthestAngle&2047; return furthestAngle & 2047;
} }
int A_FurthestVisiblePoint(int const spriteNum, uspritetype * const ts, vec2_t * const vect) int A_FurthestVisiblePoint(int const spriteNum, uspritetype * const ts, vec2_t * const vect)
@ -485,7 +487,7 @@ void A_Fall(int const spriteNum)
} }
} }
int32_t __fastcall G_GetAngleDelta(int32_t currAngle, int32_t newAngle) int __fastcall G_GetAngleDelta(int currAngle, int newAngle)
{ {
currAngle &= 2047; currAngle &= 2047;
newAngle &= 2047; newAngle &= 2047;
@ -955,7 +957,7 @@ static void VM_AddInventory(DukePlayer_t * const pPlayer, int const itemNum, int
} }
#endif #endif
static int32_t A_GetVerticalVel(actor_t const * const pActor) static int A_GetVerticalVel(actor_t const * const pActor)
{ {
#ifdef LUNATIC #ifdef LUNATIC
return pActor->mv.vvel; return pActor->mv.vvel;
@ -1236,7 +1238,7 @@ LUNATIC_EXTERN void G_ShowView(vec3_t vec, fix16_t a, fix16_t horiz, int32_t sec
void Screen_Play(void) void Screen_Play(void)
{ {
int32_t running = 1; bool running = true;
I_ClearAllInput(); I_ClearAllInput();
@ -1250,10 +1252,9 @@ void Screen_Play(void)
continue; continue;
videoClearScreen(0); videoClearScreen(0);
if (VM_OnEventWithReturn(EVENT_SCREEN, g_player[screenpeek].ps->i, screenpeek, I_CheckAllInput()))
running = 0;
// nextpage(); if (VM_OnEventWithReturn(EVENT_SCREEN, g_player[screenpeek].ps->i, screenpeek, I_CheckAllInput()))
running = false;
I_ClearAllInput(); I_ClearAllInput();
} while (running); } while (running);

4
source/duke3d/src/gameexec.h
View file

@ -59,9 +59,9 @@ extern double g_eventTotalMs[MAXEVENTS], g_actorTotalMs[MAXTILES], g_actorMinMs[
void A_Execute(int spriteNum, int playerNum, int playerDist); void A_Execute(int spriteNum, int playerNum, int playerDist);
void A_Fall(int spriteNum); void A_Fall(int spriteNum);
int32_t A_GetFurthestAngle(int spriteNum, int angDiv); int A_GetFurthestAngle(int spriteNum, int angDiv);
void A_GetZLimits(int spriteNum); void A_GetZLimits(int spriteNum);
int32_t __fastcall G_GetAngleDelta(int32_t currAngle, int32_t newAngle); int __fastcall G_GetAngleDelta(int currAngle, int newAngle);
void G_RestoreMapState(); void G_RestoreMapState();
void G_SaveMapState(); void G_SaveMapState();

144
source/duke3d/src/gamevars.cpp
View file

@ -38,24 +38,24 @@ int32_t g_gameArrayCount = 0;
// pointers to weapon gamevar data // pointers to weapon gamevar data
intptr_t *aplWeaponClip[MAX_WEAPONS]; // number of items in magazine intptr_t *aplWeaponClip[MAX_WEAPONS]; // number of items in magazine
intptr_t *aplWeaponReload[MAX_WEAPONS]; // delay to reload (include fire)
intptr_t *aplWeaponFireDelay[MAX_WEAPONS]; // delay to fire intptr_t *aplWeaponFireDelay[MAX_WEAPONS]; // delay to fire
intptr_t *aplWeaponHoldDelay[MAX_WEAPONS]; // delay after release fire button to fire (0 for none)
intptr_t *aplWeaponTotalTime[MAX_WEAPONS]; // The total time the weapon is cycling before next fire.
intptr_t *aplWeaponFlags[MAX_WEAPONS]; // Flags for weapon
intptr_t *aplWeaponShoots[MAX_WEAPONS]; // what the weapon shoots
intptr_t *aplWeaponSpawnTime[MAX_WEAPONS]; // the frame at which to spawn an item
intptr_t *aplWeaponSpawn[MAX_WEAPONS]; // the item to spawn
intptr_t *aplWeaponShotsPerBurst[MAX_WEAPONS]; // number of shots per 'burst' (one ammo per 'burst')
intptr_t *aplWeaponWorksLike[MAX_WEAPONS]; // What original the weapon works like
intptr_t *aplWeaponInitialSound[MAX_WEAPONS]; // Sound made when weapon starts firing. zero for no sound
intptr_t *aplWeaponFireSound[MAX_WEAPONS]; // Sound made when firing (each time for automatic) intptr_t *aplWeaponFireSound[MAX_WEAPONS]; // Sound made when firing (each time for automatic)
intptr_t *aplWeaponSound2Time[MAX_WEAPONS]; // Alternate sound time intptr_t *aplWeaponFlags[MAX_WEAPONS]; // Flags for weapon
intptr_t *aplWeaponSound2Sound[MAX_WEAPONS]; // Alternate sound sound ID intptr_t *aplWeaponFlashColor[MAX_WEAPONS]; // Muzzle flash color
intptr_t *aplWeaponHoldDelay[MAX_WEAPONS]; // delay after release fire button to fire (0 for none)
intptr_t *aplWeaponInitialSound[MAX_WEAPONS]; // Sound made when weapon starts firing. zero for no sound
intptr_t *aplWeaponReload[MAX_WEAPONS]; // delay to reload (include fire)
intptr_t *aplWeaponReloadSound1[MAX_WEAPONS]; // Sound of magazine being removed intptr_t *aplWeaponReloadSound1[MAX_WEAPONS]; // Sound of magazine being removed
intptr_t *aplWeaponReloadSound2[MAX_WEAPONS]; // Sound of magazine being inserted intptr_t *aplWeaponReloadSound2[MAX_WEAPONS]; // Sound of magazine being inserted
intptr_t *aplWeaponSelectSound[MAX_WEAPONS]; // Sound of weapon being selected intptr_t *aplWeaponSelectSound[MAX_WEAPONS]; // Sound of weapon being selected
intptr_t *aplWeaponFlashColor[MAX_WEAPONS]; // Muzzle flash color intptr_t *aplWeaponShoots[MAX_WEAPONS]; // what the weapon shoots
intptr_t *aplWeaponShotsPerBurst[MAX_WEAPONS]; // number of shots per 'burst' (one ammo per 'burst')
intptr_t *aplWeaponSound2Sound[MAX_WEAPONS]; // Alternate sound sound ID
intptr_t *aplWeaponSound2Time[MAX_WEAPONS]; // Alternate sound time
intptr_t *aplWeaponSpawn[MAX_WEAPONS]; // the item to spawn
intptr_t *aplWeaponSpawnTime[MAX_WEAPONS]; // the frame at which to spawn an item
intptr_t *aplWeaponTotalTime[MAX_WEAPONS]; // The total time the weapon is cycling before next fire.
intptr_t *aplWeaponWorksLike[MAX_WEAPONS]; // What original the weapon works like
# include "gamestructures.cpp" # include "gamestructures.cpp"
@ -65,20 +65,18 @@ intptr_t *aplWeaponFlashColor[MAX_WEAPONS]; // Muzzle flash color
// Returns: old g_gameVarCount | (g_gameArrayCount<<16). // Returns: old g_gameVarCount | (g_gameArrayCount<<16).
int Gv_Free(void) int Gv_Free(void)
{ {
for (bssize_t i=0; i<g_gameVarCount; ++i) for (auto &gameVar : aGameVars)
{ {
if (aGameVars[i].flags & GAMEVAR_USER_MASK) if (gameVar.flags & GAMEVAR_USER_MASK)
ALIGNED_FREE_AND_NULL(aGameVars[i].pValues); ALIGNED_FREE_AND_NULL(gameVar.pValues);
gameVar.flags |= GAMEVAR_RESET;
aGameVars[i].flags |= GAMEVAR_RESET;
} }
for (bssize_t i=0; i<g_gameArrayCount; ++i) for (auto & gameArray : aGameArrays)
{ {
if (aGameArrays[i].flags & GAMEARRAY_ALLOCATED) if (gameArray.flags & GAMEARRAY_ALLOCATED)
ALIGNED_FREE_AND_NULL(aGameArrays[i].pValues); ALIGNED_FREE_AND_NULL(gameArray.pValues);
gameArray.flags |= GAMEARRAY_RESET;
aGameArrays[i].flags |= GAMEARRAY_RESET;
} }
EDUKE32_STATIC_ASSERT(MAXGAMEVARS < 32768); EDUKE32_STATIC_ASSERT(MAXGAMEVARS < 32768);
@ -96,16 +94,14 @@ int Gv_Free(void)
// Only call this function during initialization or at exit // Only call this function during initialization or at exit
void Gv_Clear(void) void Gv_Clear(void)
{ {
int gameVarCount = Gv_Free(); Gv_Free();
int const gameArrayCount = gameVarCount >> 16;
gameVarCount &= 65535;
// Now, only do work that Gv_Free() hasn't done. // Now, only do work that Gv_Free() hasn't done.
for (bssize_t i=0; i<gameVarCount; ++i) for (auto & gameVar : aGameVars)
DO_FREE_AND_NULL(aGameVars[i].szLabel); DO_FREE_AND_NULL(gameVar.szLabel);
for (bssize_t i=0; i<gameArrayCount; i++) for (auto & gameArray : aGameArrays)
DO_FREE_AND_NULL(aGameArrays[i].szLabel); DO_FREE_AND_NULL(gameArray.szLabel);
} }
int Gv_ReadSave(int32_t kFile) int Gv_ReadSave(int32_t kFile)
@ -592,7 +588,7 @@ int __fastcall Gv_GetArrayValue(int const id, int index)
if (aGameArrays[id].flags & GAMEARRAY_STRIDE2) if (aGameArrays[id].flags & GAMEARRAY_STRIDE2)
index <<= 1; index <<= 1;
int returnValue = -1; int returnValue = 0;
switch (aGameArrays[id].flags & GAMEARRAY_TYPE_MASK) switch (aGameArrays[id].flags & GAMEARRAY_TYPE_MASK)
{ {
@ -610,14 +606,14 @@ int __fastcall Gv_GetArrayValue(int const id, int index)
return returnValue; return returnValue;
} }
#define CHECK_INDEX(range) \ #define CHECK_INDEX(range) \
if (EDUKE32_PREDICT_FALSE((unsigned)arrayIndex >= range)) \ if (EDUKE32_PREDICT_FALSE((unsigned)arrayIndex >= (unsigned)range)) \
{ \ { \
spriteNum = arrayIndex; \ spriteNum = arrayIndex; \
goto badindex; \ goto badindex; \
} }
int __fastcall Gv_GetSpecialVar(int gameVar, int spriteNum, int playerNum) static int __fastcall Gv_GetSpecialVar(int gameVar, int spriteNum, int const playerNum)
{ {
int returnValue = 0; int returnValue = 0;
@ -646,8 +642,8 @@ int __fastcall Gv_GetSpecialVar(int gameVar, int spriteNum, int playerNum)
switch (gameVar - g_structVarIDs) switch (gameVar - g_structVarIDs)
{ {
case STRUCT_SPRITE: case STRUCT_SPRITE:
arrayIndexVar = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVar(*insptr++, spriteNum, playerNum) : 0;
CHECK_INDEX(MAXSPRITES); CHECK_INDEX(MAXSPRITES);
arrayIndexVar = (ActorLabels[labelNum].flags & LABEL_HASPARM2) ? Gv_GetVar(*insptr++, spriteNum, playerNum) : 0;
returnValue = VM_GetSprite(arrayIndex, labelNum, arrayIndexVar); returnValue = VM_GetSprite(arrayIndex, labelNum, arrayIndexVar);
break; break;
@ -1184,7 +1180,7 @@ void Gv_ResetSystemDefaults(void)
for (int weaponNum = 0; weaponNum < MAX_WEAPONS; ++weaponNum) for (int weaponNum = 0; weaponNum < MAX_WEAPONS; ++weaponNum)
{ {
for (bssize_t playerNum = 0; playerNum < MAXPLAYERS; ++playerNum) for (int playerNum = 0; playerNum < MAXPLAYERS; ++playerNum)
{ {
Bsprintf(aszBuf, "WEAPON%d_CLIP", weaponNum); Bsprintf(aszBuf, "WEAPON%d_CLIP", weaponNum);
aplWeaponClip[weaponNum][playerNum] = Gv_GetVarByLabel(aszBuf, 0, -1, playerNum); aplWeaponClip[weaponNum][playerNum] = Gv_GetVarByLabel(aszBuf, 0, -1, playerNum);
@ -1229,17 +1225,17 @@ void Gv_ResetSystemDefaults(void)
} }
} }
g_aimAngleVarID = Gv_GetVarIndex("AUTOAIMANGLE");
g_angRangeVarID = Gv_GetVarIndex("ANGRANGE");
g_hitagVarID = Gv_GetVarIndex("HITAG");
g_lotagVarID = Gv_GetVarIndex("LOTAG");
g_returnVarID = Gv_GetVarIndex("RETURN"); g_returnVarID = Gv_GetVarIndex("RETURN");
g_structVarIDs = Gv_GetVarIndex("sprite");
g_textureVarID = Gv_GetVarIndex("TEXTURE");
g_thisActorVarID = Gv_GetVarIndex("THISACTOR");
g_weaponVarID = Gv_GetVarIndex("WEAPON"); g_weaponVarID = Gv_GetVarIndex("WEAPON");
g_worksLikeVarID = Gv_GetVarIndex("WORKSLIKE"); g_worksLikeVarID = Gv_GetVarIndex("WORKSLIKE");
g_zRangeVarID = Gv_GetVarIndex("ZRANGE"); g_zRangeVarID = Gv_GetVarIndex("ZRANGE");
g_angRangeVarID = Gv_GetVarIndex("ANGRANGE");
g_aimAngleVarID = Gv_GetVarIndex("AUTOAIMANGLE");
g_lotagVarID = Gv_GetVarIndex("LOTAG");
g_hitagVarID = Gv_GetVarIndex("HITAG");
g_textureVarID = Gv_GetVarIndex("TEXTURE");
g_thisActorVarID = Gv_GetVarIndex("THISACTOR");
g_structVarIDs = Gv_GetVarIndex("sprite");
#endif #endif
for (auto & tile : g_tile) for (auto & tile : g_tile)
@ -1462,22 +1458,22 @@ static void Gv_AddSystemVars(void)
#if !defined LUNATIC #if !defined LUNATIC
// special vars for struct access // special vars for struct access
// KEEPINSYNC gamedef.h: enum QuickStructureAccess_t (including order) // KEEPINSYNC gamedef.h: enum QuickStructureAccess_t (including order)
Gv_NewVar("sprite", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("sprite", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("__sprite__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("__sprite__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("__actor__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("__actor__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("__spriteext__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("__spriteext__", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("sector", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("sector", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("wall", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("wall", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("player", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("player", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("actorvar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("actorvar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("playervar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("playervar", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("tspr", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("tspr", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("projectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("projectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("thisprojectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("thisprojectile", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("userdef", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("userdef", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("input", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("input", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("tiledata", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("tiledata", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
Gv_NewVar("paldata", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL); Gv_NewVar("paldata", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
#endif #endif
if (NAM_WW2GI) if (NAM_WW2GI)
@ -1534,25 +1530,25 @@ static void Gv_AddSystemVars(void)
for (int i=0; i<MAX_WEAPONS; i++) for (int i=0; i<MAX_WEAPONS; i++)
{ {
ADDWEAPONVAR(i, WorksLike);
ADDWEAPONVAR(i, Clip); ADDWEAPONVAR(i, Clip);
ADDWEAPONVAR(i, Reload);
ADDWEAPONVAR(i, FireDelay); ADDWEAPONVAR(i, FireDelay);
ADDWEAPONVAR(i, TotalTime);
ADDWEAPONVAR(i, HoldDelay);
ADDWEAPONVAR(i, Flags);
ADDWEAPONVAR(i, Shoots);
ADDWEAPONVAR(i, SpawnTime);
ADDWEAPONVAR(i, Spawn);
ADDWEAPONVAR(i, ShotsPerBurst);
ADDWEAPONVAR(i, InitialSound);
ADDWEAPONVAR(i, FireSound); ADDWEAPONVAR(i, FireSound);
ADDWEAPONVAR(i, Sound2Time); ADDWEAPONVAR(i, Flags);
ADDWEAPONVAR(i, Sound2Sound); ADDWEAPONVAR(i, FlashColor);
ADDWEAPONVAR(i, HoldDelay);
ADDWEAPONVAR(i, InitialSound);
ADDWEAPONVAR(i, Reload);
ADDWEAPONVAR(i, ReloadSound1); ADDWEAPONVAR(i, ReloadSound1);
ADDWEAPONVAR(i, ReloadSound2); ADDWEAPONVAR(i, ReloadSound2);
ADDWEAPONVAR(i, SelectSound); ADDWEAPONVAR(i, SelectSound);
ADDWEAPONVAR(i, FlashColor); ADDWEAPONVAR(i, Shoots);
ADDWEAPONVAR(i, ShotsPerBurst);
ADDWEAPONVAR(i, Sound2Sound);
ADDWEAPONVAR(i, Sound2Time);
ADDWEAPONVAR(i, Spawn);
ADDWEAPONVAR(i, SpawnTime);
ADDWEAPONVAR(i, TotalTime);
ADDWEAPONVAR(i, WorksLike);
} }
#ifdef LUNATIC #ifdef LUNATIC