diff --git a/SConstruct b/SConstruct index 2a46471ab..2aa263ebb 100644 --- a/SConstruct +++ b/SConstruct @@ -367,6 +367,7 @@ class DXXProgram(DXXCommon): 'editor/kcurve.c', 'editor/kfuncs.c', 'editor/khelp.c', +'editor/ksegmove.c', 'editor/ksegsel.c', 'editor/ktmap.c', 'editor/kview.c', @@ -624,7 +625,6 @@ class D1XProgram(DXXProgram): 'editor/group.c', 'editor/kgame.c', 'editor/kmine.c', -'editor/ksegmove.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', @@ -766,7 +766,6 @@ class D2XProgram(DXXProgram): 'editor/group.c', 'editor/kgame.c', 'editor/kmine.c', -'editor/ksegmove.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', diff --git a/d2x-rebirth/editor/ksegmove.c b/d2x-rebirth/editor/ksegmove.c deleted file mode 100644 index 9835d6df6..000000000 --- a/d2x-rebirth/editor/ksegmove.c +++ /dev/null @@ -1,85 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -/* - * - * Functions for moving segments. - * - */ - - -//#include -//#include -//#include -//#include - -#include "inferno.h" -#include "editor.h" -#include "editor/esegment.h" - -// -- old -- int SegOrientCommon(fixang *ang, fix val) -// -- old -- { -// -- old -- *ang += val; -// -- old -- med_rotate_segment_ang(Cursegp,&Seg_orientation); -// -- old -- Update_flags |= UF_WORLD_CHANGED; -// -- old -- mine_changed = 1; -// -- old -- warn_if_concave_segment(Cursegp); -// -- old -- return 1; -// -- old -- } - -int SegOrientCommon(fixang *ang, fix val) -{ - Seg_orientation.p = 0; - Seg_orientation.b = 0; - Seg_orientation.h = 0; - - *ang += val; - rotate_segment_new(&Seg_orientation); - Update_flags |= UF_WORLD_CHANGED; - mine_changed = 1; - warn_if_concave_segment(Cursegp); - return 1; -} - -// ---------- segment orientation control ---------- - -int DecreaseHeading() -{ - // decrease heading - return SegOrientCommon(&Seg_orientation.h,-512); -} - -int IncreaseHeading() -{ - return SegOrientCommon(&Seg_orientation.h,+512); -} - -int DecreasePitch() -{ - return SegOrientCommon(&Seg_orientation.p,-512); -} - -int IncreasePitch() -{ - return SegOrientCommon(&Seg_orientation.p,+512); -} - -int DecreaseBank() -{ - return SegOrientCommon(&Seg_orientation.b,-512); -} - -int IncreaseBank() -{ - return SegOrientCommon(&Seg_orientation.b,+512); -} diff --git a/d1x-rebirth/editor/ksegmove.c b/similar/editor/ksegmove.c similarity index 100% rename from d1x-rebirth/editor/ksegmove.c rename to similar/editor/ksegmove.c