Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/func_breakable_respawn
git-manager created issue #426 (closed) on 2011-04-22T17:33:23Z:
Purpose of the branch:
A tiny change that makes func_breakable and misc_breakablemodel time respawnable, via the respawntime key. Currently needed for finishing the barrels on Red Planet.
Repository: xonotic/xonotic-data.pk3dir.git Commit: 79325aba Branch: mirceakitsune/func_breakable_respawn
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '79325abafd12f3eb098a5e75aca2bcde5369d577'..'origin/mirceakitsune/func_breakable_respawn'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/mirceakitsune/func_breakable_respawn'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'mirceakitsune/func_breakable_respawn'
Diffstat:
qcsrc/server/func_breakable.qc | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Revision log:
commit 79325abafd12f3eb098a5e75aca2bcde5369d577
Author: Mircea Kitsune
Commit: Mircea Kitsune
Allow func_breakable entities to respawn, using the respawntime key. Tested and works
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/server/func\_breakable.qc b/qcsrc/server/func\_breakable.qc
index 51a1edf..436fde3 100644
— a/qcsrc/server/func\_breakable.qc
**+ b/qcsrc/server/func\_breakable.qc
@ -169,6 +169,12
@ void func\_breakable\_destroy {
if
pointparticles;
- if(self.respawntime)
- {
- self.think = func_breakable_restore;
- self.nextthink = time + self.respawntime;
- }
oldmsg = self.message; self.message = “”; SUB_UseTargets();