From: TimePath Date: Sun, 21 Aug 2016 06:29:24 +0000 (+1000) Subject: Merge branch 'TimePath/modules' X-Git-Tag: xonotic-v0.8.2~688 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06ac66a5edaa645e19ed9a6482409e8656a65b1d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'TimePath/modules' # Conflicts: # qcsrc/common/turrets/turret/fusionreactor.qc --- 06ac66a5edaa645e19ed9a6482409e8656a65b1d diff --cc qcsrc/common/turrets/turret/fusionreactor.qh index 000000000,5d3313e55..134b805e9 mode 000000,100644..100644 --- a/qcsrc/common/turrets/turret/fusionreactor.qh +++ b/qcsrc/common/turrets/turret/fusionreactor.qh @@@ -1,0 -1,13 +1,13 @@@ + #pragma once + + CLASS(FusionReactor, Turret) + /* spawnflags */ ATTRIB(FusionReactor, spawnflags, int, TUR_FLAG_SUPPORT | TUR_FLAG_AMMOSOURCE); + /* mins */ ATTRIB(FusionReactor, mins, vector, '-34 -34 0'); + /* maxs */ ATTRIB(FusionReactor, maxs, vector, '34 34 90'); + /* modelname */ ATTRIB(FusionReactor, mdl, string, "base.md3"); + /* model */ ATTRIB_STRZONE(FusionReactor, model, string, strcat("models/turrets/", this.mdl)); + /* head_model */ ATTRIB_STRZONE(FusionReactor, head_model, string, strcat("models/turrets/", "reactor.md3")); -/* netname */ ATTRIB(FusionReactor, netname, string, "fusionreactor"); ++/* netname */ ATTRIB(FusionReactor, netname, string, "fusreac"); + /* fullname */ ATTRIB(FusionReactor, turret_name, string, _("Fusion Reactor")); + ENDCLASS(FusionReactor) + REGISTER_TURRET(FUSIONREACTOR, NEW(FusionReactor));