From af3707d1c01a939ae8018605400ab18ad8e24150 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 3 Mar 2013 01:03:33 +0000
Subject: [PATCH] Move */editor/kcurve.c -> similar/editor/kcurve.c

---
 SConstruct                               |   3 +-
 d2x-rebirth/editor/kcurve.c              | 135 -----------------------
 {d1x-rebirth => similar}/editor/kcurve.c |   0
 3 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 d2x-rebirth/editor/kcurve.c
 rename {d1x-rebirth => similar}/editor/kcurve.c (100%)

diff --git a/SConstruct b/SConstruct
index 74f4ecace..216d67db9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -323,6 +323,7 @@ class DXXProgram(DXXCommon):
 ]
 ]
 	similar_editor_sources = [os.path.join('similar', f) for f in [
+'editor/kcurve.c',
 'editor/kfuncs.c',
 'editor/khelp.c',
 ]
@@ -584,7 +585,6 @@ class D1XProgram(DXXProgram):
 'editor/group.c',
 'editor/info.c',
 'editor/kbuild.c',
-'editor/kcurve.c',
 'editor/kgame.c',
 'editor/kmine.c',
 'editor/ksegmove.c',
@@ -750,7 +750,6 @@ class D2XProgram(DXXProgram):
 'editor/group.c',
 'editor/info.c',
 'editor/kbuild.c',
-'editor/kcurve.c',
 'editor/kgame.c',
 'editor/kmine.c',
 'editor/ksegmove.c',
diff --git a/d2x-rebirth/editor/kcurve.c b/d2x-rebirth/editor/kcurve.c
deleted file mode 100644
index a603e3eb6..000000000
--- a/d2x-rebirth/editor/kcurve.c
+++ /dev/null
@@ -1,135 +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 curve stuff.
- *
- */
-
-
-#include <string.h>
-
-#include "inferno.h"
-#include "editor.h"
-#include "kdefs.h"
-
-static fix         r1scale, r4scale;
-static int         curve;
-
-int InitCurve()
-{
-	curve = 0;
-    return 1;
-}
-
-int GenerateCurve()
-{
-    if ( (Markedsegp != 0) && !IS_CHILD(Markedsegp->children[Markedside])) {
-		r1scale = r4scale = F1_0*20;
-      autosave_mine( mine_filename );
-      diagnostic_message("Curve Generated.");
-		Update_flags |= UF_WORLD_CHANGED;
-      curve = generate_curve(r1scale, r4scale);
-		mine_changed = 1;
-        if (curve == 1) {
-            strcpy(undo_status[Autosave_count], "Curve Generation UNDONE.\n");
-        }
-        if (curve == 0) diagnostic_message("Cannot generate curve -- check Current segment.");
-    }
-    else diagnostic_message("Cannot generate curve -- check Marked segment.");
-	warn_if_concave_segments();
-
-	return 1;
-}
-
-int DecreaseR4()
-{
-	if (curve) {
-	   Update_flags |= UF_WORLD_CHANGED;
-	   delete_curve();
-	   r4scale -= F1_0;
-	   generate_curve(r1scale, r4scale);
-      diagnostic_message("R4 vector decreased.");
-	   mine_changed = 1;
-		warn_if_concave_segments();
-	}
-	return 1;
-}
-
-int IncreaseR4()
-{
-	if (curve) {
-	   Update_flags |= UF_WORLD_CHANGED;
-	   delete_curve();
-	   r4scale += F1_0;
-	   generate_curve(r1scale, r4scale);
-      diagnostic_message("R4 vector increased.");
-	   mine_changed = 1;
-		warn_if_concave_segments();
-	}
-	return 1;
-}
-
-int DecreaseR1()
-{
-	if (curve) {
-	   Update_flags |= UF_WORLD_CHANGED;
-	   delete_curve();
-	   r1scale -= F1_0;
-	   generate_curve(r1scale, r4scale);
-      diagnostic_message("R1 vector decreased.");
-	   mine_changed = 1;
-		warn_if_concave_segments();
-	}
-	return 1;
-}
-
-int IncreaseR1()
-{
-	if (curve) {
-	   Update_flags |= UF_WORLD_CHANGED;
-	   delete_curve();
-	   r1scale += F1_0;
-	   generate_curve(r1scale, r4scale);
-      diagnostic_message("R1 vector increased.");
-	   mine_changed = 1;
-		warn_if_concave_segments();
-	}
-	return 1;
-}
-
-int DeleteCurve()
-{
-// fix_bogus_uvs_all();
-set_average_light_on_curside();
-
-	if (curve) {
-	   Update_flags |= UF_WORLD_CHANGED;
-	   delete_curve();
-	   curve = 0;
-	   mine_changed = 1;
-      diagnostic_message("Curve Deleted.");
-		warn_if_concave_segments();
-	}
-	return 1;
-}
-
-int SetCurve()
-{
-	if (curve) curve = 0;
-   //autosave_mine( mine_filename );
-   //strcpy(undo_status[Autosave_count], "Curve Generation UNDONE.\n");
-   return 1;
-}
-
diff --git a/d1x-rebirth/editor/kcurve.c b/similar/editor/kcurve.c
similarity index 100%
rename from d1x-rebirth/editor/kcurve.c
rename to similar/editor/kcurve.c