[nexuiz-commits] r8688 - in trunk/data/qcsrc: client common server server/bot/havocbot warpzonelib
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Feb 28 14:42:32 EST 2010
Author: div0
Date: 2010-02-28 14:42:31 -0500 (Sun, 28 Feb 2010)
New Revision: 8688
Modified:
trunk/data/qcsrc/client/particles.qc
trunk/data/qcsrc/common/util.qc
trunk/data/qcsrc/common/util.qh
trunk/data/qcsrc/server/bot/havocbot/havocbot.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/warpzonelib/COPYING
trunk/data/qcsrc/warpzonelib/anglestransform.qc
trunk/data/qcsrc/warpzonelib/client.qc
trunk/data/qcsrc/warpzonelib/common.qc
trunk/data/qcsrc/warpzonelib/common.qh
trunk/data/qcsrc/warpzonelib/server.qc
trunk/data/qcsrc/warpzonelib/util_server.qc
trunk/data/qcsrc/warpzonelib/util_server.qh
Log:
make warpzonelib depend less on Nexuiz
Modified: trunk/data/qcsrc/client/particles.qc
===================================================================
--- trunk/data/qcsrc/client/particles.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/client/particles.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -43,7 +43,7 @@
p_x += random() * sz_x;
p_y += random() * sz_y;
p_z += random() * sz_z;
- if(BoxTouchesBrush(p, p, self, world))
+ if(WarpZoneLib_BoxTouchesBrush(p, p, self, world))
{
if(self.movedir != '0 0 0')
{
Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/common/util.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1864,58 +1864,4 @@
}
#ifndef MENUQC
-vector BoxTouchesBrush_mins;
-vector BoxTouchesBrush_maxs;
-entity BoxTouchesBrush_ent;
-entity BoxTouchesBrush_ignore;
-float BoxTouchesBrush_Recurse()
-{
- float s;
- entity se;
- float f;
-
- tracebox('0 0 0', BoxTouchesBrush_mins, BoxTouchesBrush_maxs, '0 0 0', MOVE_NOMONSTERS, BoxTouchesBrush_ignore);
-#ifdef CSQC
- if (trace_networkentity)
- {
- dprint("hit a network ent, cannot continue BoxTouchesBrush\n");
- // we cannot continue, as a player blocks us...
- // so, abort
- return 0;
- }
#endif
- if not(trace_ent)
- return 0;
- if (trace_ent == BoxTouchesBrush_ent)
- return 1;
-
-
-
- se = trace_ent;
- s = se.solid;
- se.solid = SOLID_NOT;
- f = BoxTouchesBrush_Recurse();
- se.solid = s;
-
- return f;
-}
-
-float BoxTouchesBrush(vector mi, vector ma, entity e, entity ig)
-{
- float f, s;
-
- if not(e.modelindex)
- return 1;
-
- s = e.solid;
- e.solid = SOLID_BSP;
- BoxTouchesBrush_mins = mi;
- BoxTouchesBrush_maxs = ma;
- BoxTouchesBrush_ent = e;
- BoxTouchesBrush_ignore = ig;
- f = BoxTouchesBrush_Recurse();
- e.solid = s;
-
- return f;
-}
-#endif
Modified: trunk/data/qcsrc/common/util.qh
===================================================================
--- trunk/data/qcsrc/common/util.qh 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/common/util.qh 2010-02-28 19:42:31 UTC (rev 8688)
@@ -199,7 +199,3 @@
float matchacl(string acl, string str); // matches str against ACL acl (with entries +foo*, +foo, +*foo, +*foo*, and same with - for forbidding)
float startsWith(string haystack, string needle);
float startsWithNocase(string haystack, string needle);
-
-#ifndef MENUQC
-float BoxTouchesBrush(vector mi, vector ma, entity e, entity ig);
-#endif
Modified: trunk/data/qcsrc/server/bot/havocbot/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/bot/havocbot/havocbot.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/server/bot/havocbot/havocbot.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1285,7 +1285,7 @@
entity head;
for(head = world; (head = find(head, classname, "trigger_teleport")); )
{
- if(BoxTouchesBrush(pos, pos, head, world))
+ if(WarpZoneLib_BoxTouchesBrush(pos, pos, head, world))
{
wp.wpflags |= WAYPOINTFLAG_TELEPORT;
self.lastteleporttime = 0;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1700,8 +1700,8 @@
#define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
// WARNING: this kills the trace globals
-#define EXACTTRIGGER_TOUCH if not(BoxTouchesBrush(other.absmin, other.absmax, self, other)) return
-#define EXACTTRIGGER_INIT InitSolidBSPTrigger(); self.solid = SOLID_TRIGGER
+#define EXACTTRIGGER_TOUCH if(WarpZoneLib_ExactTrigger_Touch()) return
+#define EXACTTRIGGER_INIT WarpZoneLib_ExactTrigger_Init()
#define INITPRIO_FIRST 0
#define INITPRIO_GAMETYPE 0
Modified: trunk/data/qcsrc/warpzonelib/COPYING
===================================================================
--- trunk/data/qcsrc/warpzonelib/COPYING 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/COPYING 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1,4 +1,9 @@
-/*
+The code in this directory is dual-licensed BSD and GPLv2 "or any later version".
+
+
+
+BSD license:
+
Copyright (c) 2010 Rudolf Polzer
Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -18,4 +23,347 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-*/
+
+
+
+GPL v2:
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Modified: trunk/data/qcsrc/warpzonelib/anglestransform.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/anglestransform.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/anglestransform.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -47,9 +47,12 @@
// changes in-direction to out-direction
//fixedmakevectors(transform);
//return fixedvectoangles2(-1 * v_forward, 1 * v_up);
- transform_x = 180 - transform_x;
+ transform_x = -transform_x;
transform_y = 180 + transform_y;
transform_z = -transform_z;
+ // pitch: -s +c
+ // yaw: -s -c
+ // roll: -s +c
return transform;
}
@@ -59,7 +62,7 @@
// changes in-direction to out-direction
//fixedmakevectors(transform);
//return fixedvectoangles2(-1 * v_forward, 1 * v_up);
- transform_x = 180 - transform_x;
+ transform_x = -transform_x;
transform_y = 180 + transform_y;
transform_z = 180 - transform_z;
return transform;
Modified: trunk/data/qcsrc/warpzonelib/client.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/client.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/client.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -33,8 +33,6 @@
self.avelocity = AnglesTransform_TurnDirectionFR(self.avelocity);
self.warpzone_transform = AnglesTransform_Divide(self.avelocity, self.enemy.avelocity);
-
- print(vtos(AnglesTransform_Apply(self.warpzone_transform, '0 0 1')), "\n");
self.flags = FL_CAMERA;
self.drawmask = MASK_NORMAL;
@@ -56,7 +54,7 @@
for(e = world; (e = find(e, classname, "warpzone_to")); )
{
//print(sprintf("does %s (%s to %s) touch %s?\n", e.model, vtos(e.absmin), vtos(e.absmax), vtos(pmove_org)));
- if(BoxTouchesBrush(pmove_org, pmove_org, e, world))
+ if(WarpZoneLib_BoxTouchesBrush(pmove_org, pmove_org, e, world))
{
warpzone_saved_origin = warpzone_fixview_origin;
warpzone_saved_angles = warpzone_fixview_angles;
@@ -64,7 +62,7 @@
roll = warpzone_fixview_angles_z;
warpzone_fixview_angles_z = 0;
warpzone_fixview_origin = AnglesTransform_Apply(e.warpzone_transform, warpzone_fixview_origin - e.enemy.oldorigin) + e.oldorigin;
- warpzone_fixview_angles = AnglesTransform_Normalize(AnglesTransform_ApplyToVAngles(e.warpzone_transform, warpzone_fixview_angles), TRUE);
+ warpzone_fixview_angles = WarpZone_TransformVAngles(e.warpzone_transform, warpzone_fixview_angles);
warpzone_fixview_angles_z = roll;
R_SetView(VF_ORIGIN, warpzone_fixview_origin);
R_SetView(VF_ANGLES, warpzone_fixview_angles);
Modified: trunk/data/qcsrc/warpzonelib/common.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/common.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/common.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1 +1,64 @@
-// empty yet
+vector WarpZone_TransformVAngles(vector t, vector ang)
+{
+ float roll;
+ roll = ang_z;
+ ang_z = 0;
+ ang = AnglesTransform_Normalize(AnglesTransform_ApplyToVAngles(t, ang), TRUE);
+ ang_z = roll;
+ return ang;
+}
+
+vector WarpZoneLib_BoxTouchesBrush_mins;
+vector WarpZoneLib_BoxTouchesBrush_maxs;
+entity WarpZoneLib_BoxTouchesBrush_ent;
+entity WarpZoneLib_BoxTouchesBrush_ignore;
+float WarpZoneLib_BoxTouchesBrush_Recurse()
+{
+ float s;
+ entity se;
+ float f;
+
+ tracebox('0 0 0', WarpZoneLib_BoxTouchesBrush_mins, WarpZoneLib_BoxTouchesBrush_maxs, '0 0 0', MOVE_NOMONSTERS, WarpZoneLib_BoxTouchesBrush_ignore);
+#ifdef CSQC
+ if (trace_networkentity)
+ {
+ dprint("hit a network ent, cannot continue WarpZoneLib_BoxTouchesBrush\n");
+ // we cannot continue, as a player blocks us...
+ // so, abort
+ return 0;
+ }
+#endif
+ if not(trace_ent)
+ return 0;
+ if (trace_ent == WarpZoneLib_BoxTouchesBrush_ent)
+ return 1;
+
+
+
+ se = trace_ent;
+ s = se.solid;
+ se.solid = SOLID_NOT;
+ f = WarpZoneLib_BoxTouchesBrush_Recurse();
+ se.solid = s;
+
+ return f;
+}
+
+float WarpZoneLib_BoxTouchesBrush(vector mi, vector ma, entity e, entity ig)
+{
+ float f, s;
+
+ if not(e.modelindex)
+ return 1;
+
+ s = e.solid;
+ e.solid = SOLID_BSP;
+ WarpZoneLib_BoxTouchesBrush_mins = mi;
+ WarpZoneLib_BoxTouchesBrush_maxs = ma;
+ WarpZoneLib_BoxTouchesBrush_ent = e;
+ WarpZoneLib_BoxTouchesBrush_ignore = ig;
+ f = WarpZoneLib_BoxTouchesBrush_Recurse();
+ e.solid = s;
+
+ return f;
+}
Modified: trunk/data/qcsrc/warpzonelib/common.qh
===================================================================
--- trunk/data/qcsrc/warpzonelib/common.qh 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/common.qh 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1 +1,2 @@
-// empty
+vector WarpZone_TransformVAngles(vector t, vector ang);
+float WarpZoneLib_BoxTouchesBrush(vector mi, vector ma, entity e, entity ig);
Modified: trunk/data/qcsrc/warpzonelib/server.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/server.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/server.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -44,7 +44,7 @@
o1 = AnglesTransform_Apply(self.warpzone_transform, o0 - self.warpzone_origin) + self.enemy.warpzone_origin;
v1 = AnglesTransform_Apply(self.warpzone_transform, v0);
if(player.classname == "player")
- a1 = AnglesTransform_Normalize(AnglesTransform_ApplyToVAngles(self.warpzone_transform, player.v_angle), TRUE);
+ a1 = WarpZone_TransformVAngles(self.warpzone_transform, player.v_angle);
else
a1 = AnglesTransform_ApplyToAngles(self.warpzone_transform, a0);
@@ -151,12 +151,13 @@
// the map, with another killtarget to designate its
// orientation
- // TODO nexuiz specific
string m;
m = self.model;
- EXACTTRIGGER_INIT;
+ WarpZoneLib_ExactTrigger_Init();
setmodel(self, m);
- Net_LinkEntity(self, FALSE, 0, WarpZone_Send);
+ self.SendEntity = WarpZone_Send;
+ self.SendFlags = 0xFFFFFF;
+ self.effects |= EF_NODEPTHTEST;
}
void WarpZone_InitStep_FindTarget()
Modified: trunk/data/qcsrc/warpzonelib/util_server.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/util_server.qc 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/util_server.qc 2010-02-28 19:42:31 UTC (rev 8688)
@@ -53,3 +53,30 @@
return TRUE;
}
+float WarpZoneLib_ExactTrigger_Touch()
+{
+ return !WarpZoneLib_BoxTouchesBrush(other.absmin, other.absmax, self, other);
+}
+
+void WarpZoneLib_ExactTrigger_Init()
+{
+ if (self.movedir == '0 0 0')
+ if (self.angles != '0 0 0')
+ {
+ makevectors (self.angles);
+ self.movedir = v_forward;
+ }
+ if(self.model != "")
+ {
+ precache_model(self.model);
+ setmodel(self, self.model);
+ }
+ setorigin(self, self.origin);
+ if(self.scale)
+ setsize(self, self.mins * self.scale, self.maxs * self.scale);
+ else
+ setsize(self, self.mins, self.maxs);
+ self.movetype = MOVETYPE_NONE;
+ self.solid = SOLID_TRIGGER;
+ self.model = "";
+}
Modified: trunk/data/qcsrc/warpzonelib/util_server.qh
===================================================================
--- trunk/data/qcsrc/warpzonelib/util_server.qh 2010-02-28 19:42:26 UTC (rev 8687)
+++ trunk/data/qcsrc/warpzonelib/util_server.qh 2010-02-28 19:42:31 UTC (rev 8688)
@@ -1 +1,3 @@
float WarpZoneLib_MoveOutOfSolid(entity e);
+float WarpZoneLib_ExactTrigger_Touch();
+void WarpZoneLib_ExactTrigger_Init();
More information about the nexuiz-commits
mailing list