Skip to content

Commit

Permalink
Merge pull request #404 from Iswenzz/gcc11
Browse files Browse the repository at this point in the history 
GCC: Compile with recent compilers
  • Loading branch information
@proxict
proxict authored Sep 19, 2023
2 parents b876404 + 4013101 commit 146fc62
Show file tree
Hide file tree
Showing 12 changed files with 266 additions and 505 deletions.
19 changes: 6 additions & 13 deletions src/asmsource/_bg_mantle.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
extern Com_Error
extern Cvar_RegisterBool
extern Cvar_RegisterFloat
extern mantle_enable
extern mantle_view_yawcap
extern mantle_debug
extern mantle_check_angle
extern mantle_check_range
extern mantle_check_radius

;Exports of bg_mantle:
global s_mantleTrans
global mantle_enable
global mantle_view_yawcap
global s_mantleAnims
global mantle_debug
global mantle_check_angle
global mantle_check_range
global mantle_check_radius
global s_mantleAnimNames
global Mantle_GetAnimDelta
global Mantle_CheckLedge
Expand Down Expand Up @@ -1497,14 +1497,7 @@ SECTION .rdata

;Zero initialized global or static variables of bg_mantle:
SECTION .bss
mantle_enable: resb 0x4
mantle_view_yawcap: resb 0x4
s_mantleAnims: resb 0x4
mantle_debug: resb 0x4
mantle_check_angle: resb 0x4
mantle_check_range: resb 0x4
mantle_check_radius: resb 0x68


;All cstrings:
SECTION .rdata
Expand Down
318 changes: 108 additions & 210 deletions src/asmsource/_bg_misc.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,109 @@
extern PM_GetViewHeightLerpTime
extern strncpy
extern Cvar_DisplayableValue
extern player_meleeRange
extern bg_legYawTolerance
extern bg_swingSpeed
extern player_lean_rotate_crouch_left
extern player_lean_rotate_crouch_right
extern player_lean_rotate_left
extern player_lean_rotate_right
extern player_lean_shift_crouch_left
extern player_lean_shift_crouch_right
extern player_lean_shift_left
extern player_lean_shift_right
extern player_move_factor_on_torso
extern bgShockDvarNames
extern bg_aimSpreadMoveSpeedThreshold
extern bg_bobAmplitudeDucked
extern bg_bobAmplitudeProne
extern bg_bobAmplitudeSprinting
extern bg_bobAmplitudeStanding
extern bg_bobMax
extern bg_fallDamageMaxHeight
extern bg_fallDamageMinHeight
extern bg_foliagesnd_fastinterval
extern bg_foliagesnd_maxspeed
extern bg_foliagesnd_minspeed
extern bg_foliagesnd_resetinterval
extern bg_foliagesnd_slowinterval
extern bg_ladder_yawcap
extern bg_maxGrenadeIndicatorSpeed
extern bg_prone_yawcap
extern bg_shock_lookControl
extern bg_shock_lookControl_fadeTime
extern bg_shock_lookControl_maxpitchspeed
extern bg_shock_lookControl_maxyawspeed
extern bg_shock_lookControl_mousesensitivityscale
extern bg_shock_movement
extern bg_shock_screenBlurBlendFadeTime
extern bg_shock_screenBlurBlendTime
extern bg_shock_screenFlashShotFadeTime
extern bg_shock_screenFlashWhiteFadeTime
extern bg_shock_screenType
extern bg_shock_sound
extern bg_shock_soundDryLevel
extern bg_shock_soundEnd
extern bg_shock_soundEndAbort
extern bg_shock_soundFadeInTime
extern bg_shock_soundFadeOutTime
extern bg_shock_soundLoop
extern bg_shock_soundLoopEndDelay
extern bg_shock_soundLoopFadeTime
extern bg_shock_soundLoopSilent
extern bg_shock_soundModEndDelay
extern bg_shock_soundRoomType
extern bg_shock_soundWetLevel
extern bg_shock_viewKickFadeTime
extern bg_shock_viewKickPeriod
extern bg_shock_viewKickRadius
extern bg_viewKickMax
extern bg_viewKickMin
extern bg_viewKickRandom
extern bg_viewKickScale
extern bullet_penetrationMinFxDist
extern friction
extern inertiaAngle
extern inertiaDebug
extern inertiaMax
extern player_adsExitDelay
extern player_backSpeedScale
extern player_breath_fire_delay
extern player_breath_gasp_lerp
extern player_breath_gasp_scale
extern player_breath_gasp_time
extern player_breath_hold_lerp
extern player_breath_hold_time
extern player_breath_snd_delay
extern player_breath_snd_lerp
extern player_burstFireCooldown
extern player_debugHealth
extern player_dmgtimer_flinchTime
extern player_dmgtimer_maxTime
extern player_dmgtimer_minScale
extern player_dmgtimer_stumbleTime
extern player_dmgtimer_timePerPoint
extern player_footstepsThreshhold
extern player_meleeChargeFriction
extern player_meleeHeight
extern player_meleeWidth
extern player_moveThreshhold
extern player_scopeExitOnDamage
extern player_spectateSpeedScale
extern player_sprintCameraBob
extern player_sprintForwardMinimum
extern player_sprintMinTime
extern player_sprintRechargePause
extern player_sprintSpeedScale
extern player_sprintStrafeSpeedScale
extern player_sprintTime
extern player_strafeAnimCosAngle
extern player_strafeSpeedScale
extern player_sustainAmmo
extern player_turnAnims
extern player_view_pitch_down
extern player_view_pitch_up
extern stopspeed

;Exports of bg_misc:
global bg_soundRoomTypes
Expand Down Expand Up @@ -78,115 +181,12 @@
global BG_SetShellShockParmsFromDvars
global BG_PlayerHasRoomForEntAllAmmoTypes
global BG_AddPredictableEventToPlayerstate
global player_meleeRange
global bg_legYawTolerance
global bg_swingSpeed
global player_lean_rotate_crouch_left
global player_lean_rotate_crouch_right
global player_lean_rotate_left
global player_lean_rotate_right
global player_lean_shift_crouch_left
global player_lean_shift_crouch_right
global player_lean_shift_left
global player_lean_shift_right
global player_move_factor_on_torso
global bgShockChannelNames
global bgShockDvarNames
global bg_aimSpreadMoveSpeedThreshold
global bg_bobAmplitudeDucked
global bg_bobAmplitudeProne
global bg_bobAmplitudeSprinting
global bg_bobAmplitudeStanding
global bg_bobMax
global bg_fallDamageMaxHeight
global bg_fallDamageMinHeight
global bg_foliagesnd_fastinterval
global bg_foliagesnd_maxspeed
global bg_foliagesnd_minspeed
global bg_foliagesnd_resetinterval
global bg_foliagesnd_slowinterval
global bg_ladder_yawcap
global bg_maxGrenadeIndicatorSpeed
global bg_prone_yawcap
global bg_shellshockParms
global bg_shock_lookControl
global bg_shock_lookControl_fadeTime
global bg_shock_lookControl_maxpitchspeed
global bg_shock_lookControl_maxyawspeed
global bg_shock_lookControl_mousesensitivityscale
global bg_shock_movement
global bg_shock_screenBlurBlendFadeTime
global bg_shock_screenBlurBlendTime
global bg_shock_screenFlashShotFadeTime
global bg_shock_screenFlashWhiteFadeTime
global bg_shock_screenType
global bg_shock_sound
global bg_shock_soundDryLevel
global bg_shock_soundEnd
global bg_shock_soundEndAbort
global bg_shock_soundFadeInTime
global bg_shock_soundFadeOutTime
global bg_shock_soundLoop
global bg_shock_soundLoopEndDelay
global bg_shock_soundLoopFadeTime
global bg_shock_soundLoopSilent
global bg_shock_soundModEndDelay
global bg_shock_soundRoomType
global bg_shock_soundWetLevel
global bg_shock_viewKickFadeTime
global bg_shock_viewKickPeriod
global bg_shock_viewKickRadius
global bg_shock_volume
global bg_viewKickMax
global bg_viewKickMin
global bg_viewKickRandom
global bg_viewKickScale
global bullet_penetrationMinFxDist
global eventnames
global friction
global inertiaAngle
global inertiaDebug
global inertiaMax
global player_adsExitDelay
global player_backSpeedScale
global player_breath_fire_delay
global player_breath_gasp_lerp
global player_breath_gasp_scale
global player_breath_gasp_time
global player_breath_hold_lerp
global player_breath_hold_time
global player_breath_snd_delay
global player_breath_snd_lerp
global player_burstFireCooldown
global player_debugHealth
global player_dmgtimer_flinchTime
global player_dmgtimer_maxTime
global player_dmgtimer_minScale
global player_dmgtimer_stumbleTime
global player_dmgtimer_timePerPoint
global player_footstepsThreshhold
global player_meleeChargeFriction
global player_meleeHeight
global player_meleeWidth
global player_moveThreshhold
global player_scopeExitOnDamage
global player_spectateSpeedScale
global player_sprintCameraBob
global player_sprintForwardMinimum
global player_sprintMinTime
global player_sprintRechargePause
global player_sprintSpeedScale
global player_sprintStrafeSpeedScale
global player_sprintTime
global player_strafeAnimCosAngle
global player_strafeSpeedScale
global player_sustainAmmo
global player_turnAnims
global player_view_pitch_down
global player_view_pitch_up
global serverOnlyEvents
global singleClientEvents
global stopspeed
global bg_shock_volume
global bgShockChannelNames
global bg_shellshockParms


SECTION .text
Expand Down Expand Up @@ -2869,111 +2869,9 @@ singleClientEvents: dd 0x6, 0x7, 0x8, 0x22, 0xd, 0xe, 0x20, 0x21, 0x22, 0x25, 0x
;Zero initialized global or static variables of bg_misc:
SECTION .bss
_ZZ22BG_SaveShellShockDvarsPKcE7filebuf: resb 0x10000
player_meleeRange: resb 0x4
bg_legYawTolerance: resb 0x4
bg_swingSpeed: resb 0x4
player_lean_rotate_crouch_left: resb 0x4
player_lean_rotate_crouch_right: resb 0x4
player_lean_rotate_left: resb 0x4
player_lean_rotate_right: resb 0x4
player_lean_shift_crouch_left: resb 0x4
player_lean_shift_crouch_right: resb 0x4
player_lean_shift_left: resb 0x4
player_lean_shift_right: resb 0x4
player_move_factor_on_torso: resb 0x4
bgShockChannelNames: resb 0x1400
bg_aimSpreadMoveSpeedThreshold: resb 0x4
bg_bobAmplitudeDucked: resb 0x4
bg_bobAmplitudeProne: resb 0x4
bg_bobAmplitudeSprinting: resb 0x4
bg_bobAmplitudeStanding: resb 0x4
bg_bobMax: resb 0x4
bg_fallDamageMaxHeight: resb 0x4
bg_fallDamageMinHeight: resb 0x4
bg_foliagesnd_fastinterval: resb 0x4
bg_foliagesnd_maxspeed: resb 0x4
bg_foliagesnd_minspeed: resb 0x4
bg_foliagesnd_resetinterval: resb 0x4
bg_foliagesnd_slowinterval: resb 0x4
bg_ladder_yawcap: resb 0x4
bg_maxGrenadeIndicatorSpeed: resb 0x4
bg_prone_yawcap: resb 0x4
bg_shellshockParms: resb 0x2680
bg_shock_lookControl: resb 0x1c
bg_shock_lookControl_fadeTime: resb 0x4
bg_shock_lookControl_maxpitchspeed: resb 0x4
bg_shock_lookControl_maxyawspeed: resb 0x4
bg_shock_lookControl_mousesensitivityscale: resb 0x4
bg_shock_movement: resb 0x4
bg_shock_screenBlurBlendFadeTime: resb 0x4
bg_shock_screenBlurBlendTime: resb 0x4
bg_shock_screenFlashShotFadeTime: resb 0x4
bg_shock_screenFlashWhiteFadeTime: resb 0x4
bg_shock_screenType: resb 0x70
bg_shock_sound: resb 0x4
bg_shock_soundDryLevel: resb 0x4
bg_shock_soundEnd: resb 0x4
bg_shock_soundEndAbort: resb 0x4
bg_shock_soundFadeInTime: resb 0x4
bg_shock_soundFadeOutTime: resb 0x4
bg_shock_soundLoop: resb 0x4
bg_shock_soundLoopEndDelay: resb 0x4
bg_shock_soundLoopFadeTime: resb 0x4
bg_shock_soundLoopSilent: resb 0x4
bg_shock_soundModEndDelay: resb 0x4
bg_shock_soundRoomType: resb 0x4
bg_shock_soundWetLevel: resb 0x4
bg_shock_viewKickFadeTime: resb 0x4
bg_shock_viewKickPeriod: resb 0x4
bg_shock_viewKickRadius: resb 0x4
bg_shock_volume: resb 0x100
bg_viewKickMax: resb 0x4
bg_viewKickMin: resb 0x4
bg_viewKickRandom: resb 0x4
bg_viewKickScale: resb 0x4
bullet_penetrationMinFxDist: resb 0x4
friction: resb 0x4
inertiaAngle: resb 0x4
inertiaDebug: resb 0x4
inertiaMax: resb 0x4
player_adsExitDelay: resb 0x4
player_backSpeedScale: resb 0x4
player_breath_fire_delay: resb 0x4
player_breath_gasp_lerp: resb 0x4
player_breath_gasp_scale: resb 0x4
player_breath_gasp_time: resb 0x4
player_breath_hold_lerp: resb 0x4
player_breath_hold_time: resb 0x4
player_breath_snd_delay: resb 0x4
player_breath_snd_lerp: resb 0x4
player_burstFireCooldown: resb 0x4
player_debugHealth: resb 0x4
player_dmgtimer_flinchTime: resb 0x4
player_dmgtimer_maxTime: resb 0x4
player_dmgtimer_minScale: resb 0x4
player_dmgtimer_stumbleTime: resb 0x4
player_dmgtimer_timePerPoint: resb 0x4
player_footstepsThreshhold: resb 0x4
player_meleeChargeFriction: resb 0x4
player_meleeHeight: resb 0x4
player_meleeWidth: resb 0x4
player_moveThreshhold: resb 0x4
player_scopeExitOnDamage: resb 0x4
player_spectateSpeedScale: resb 0x4
player_sprintCameraBob: resb 0x4
player_sprintForwardMinimum: resb 0x4
player_sprintMinTime: resb 0x4
player_sprintRechargePause: resb 0x4
player_sprintSpeedScale: resb 0x4
player_sprintStrafeSpeedScale: resb 0x4
player_sprintTime: resb 0x4
player_strafeAnimCosAngle: resb 0x4
player_strafeSpeedScale: resb 0x4
player_sustainAmmo: resb 0x4
player_turnAnims: resb 0x4
player_view_pitch_down: resb 0x4
player_view_pitch_up: resb 0x4
stopspeed: resb 0x4
bg_shellshockParms: resb 0x2680
bgShockChannelNames: resb 0x1400


;All cstrings:
Expand Down
Loading

0 comments on commit 146fc62

Please sign in to comment.