Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
X
xonotic-data.pk3dir
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
6
Snippets
Groups
Projects
Show more breadcrumbs
Xonotic
xonotic-data.pk3dir
Merge requests
!1147
Fix crylink and vaporizer being able to fire with empty magazines
代码
评审变更
检出分支
下载
补丁
文本差异
Merged
Fix crylink and vaporizer being able to fire with empty magazines
drjaska/wep-reload-fixes
into
master
Overview
5
Commits
6
Pipelines
13
Changes
1
Merged
Dr. Jaska
requested to merge
drjaska/wep-reload-fixes
into
master
2 years ago
Overview
5
Commits
6
Pipelines
13
Changes
1
Expand
If reloading bail out of firing crylink or vaporizer.
Before and After:
2023-03-19_14-10-32
0
0
Merge request reports
Viewing commit
f3dc258d
Prev
Next
Show latest version
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
f3dc258d
fix 2 previous comments "minsta" -> "rocket minsta" to specify
· f3dc258d
Dr. Jaska
authored
1 year ago
qcsrc/common/weapons/weapon/vaporizer.qc
+
2
−
2
Options
@@ -255,11 +255,11 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent
// if the laser uses load, we also consider its ammo for reloading
if
(
WEP_CVAR
(
vaporizer
,
reload_ammo
)
&&
WEP_CVAR_SEC
(
vaporizer
,
ammo
)
&&
actor
.(
weaponentity
).
clip_load
<
min
(
vaporizer_ammo
,
WEP_CVAR_SEC
(
vaporizer
,
ammo
)))
{
// forced reload
thiswep
.
wr_reload
(
thiswep
,
actor
,
weaponentity
);
actor
.(
weaponentity
).
hagar_load
=
false
;
// minsta
gib
exclusive var
actor
.(
weaponentity
).
hagar_load
=
false
;
//
rocket
minsta exclusive var
return
;
}
else
if
(
WEP_CVAR
(
vaporizer
,
reload_ammo
)
&&
actor
.(
weaponentity
).
clip_load
<
vaporizer_ammo
)
{
// forced reload
thiswep
.
wr_reload
(
thiswep
,
actor
,
weaponentity
);
actor
.(
weaponentity
).
hagar_load
=
false
;
// minsta
gib
exclusive var
actor
.(
weaponentity
).
hagar_load
=
false
;
//
rocket
minsta exclusive var
return
;
}
if
((
fire
&
1
)
&&
(
GetResource
(
actor
,
RES_CELLS
)
||
!
autocvar_g_rm
)
&&
!
weaponLocked
(
actor
))
Loading