From 53c19f14f12d09e9209196b2bbaaabaf741ded86 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */editor/kmine.c -> similar/editor/kmine.c --- SConstruct | 3 +- d2x-rebirth/editor/kmine.c | 256 ------------------------ {d1x-rebirth => similar}/editor/kmine.c | 0 3 files changed, 1 insertion(+), 258 deletions(-) delete mode 100644 d2x-rebirth/editor/kmine.c rename {d1x-rebirth => similar}/editor/kmine.c (100%) diff --git a/SConstruct b/SConstruct index 2aa263ebb..7e6e5398a 100644 --- a/SConstruct +++ b/SConstruct @@ -367,6 +367,7 @@ class DXXProgram(DXXCommon): 'editor/kcurve.c', 'editor/kfuncs.c', 'editor/khelp.c', +'editor/kmine.c', 'editor/ksegmove.c', 'editor/ksegsel.c', 'editor/ktmap.c', @@ -624,7 +625,6 @@ class D1XProgram(DXXProgram): 'editor/eswitch.c', 'editor/group.c', 'editor/kgame.c', -'editor/kmine.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', @@ -765,7 +765,6 @@ class D2XProgram(DXXProgram): 'editor/eswitch.c', 'editor/group.c', 'editor/kgame.c', -'editor/kmine.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', diff --git a/d2x-rebirth/editor/kmine.c b/d2x-rebirth/editor/kmine.c deleted file mode 100644 index 791d3ccf6..000000000 --- a/d2x-rebirth/editor/kmine.c +++ /dev/null @@ -1,256 +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 to change entire mines. - * - */ - -#include -#include -#include -#include "dxxerror.h" -#include "strutil.h" -#include "inferno.h" -#include "editor.h" -#include "editor/esegment.h" -#include "ui.h" -#include "texpage.h" // For texpage_goto_first -#include "segment.h" -#include "kdefs.h" -#include "info.h" -#include "game.h" -#include "gameseq.h" -#include "object.h" - -#define MINESAVE_CRIPPLED 0 - -char mine_filename[PATH_MAX] = "*.MIN"; -char sit_filename[PATH_MAX] = "*.SIT"; - -#define MAX_NAME_LENGTH PATH_MAX - -// See if filename f contains an extent. If not, add extent ext. -void checkforext( char * f, char *ext ) -{ - int i; - - for (i=1; ipos.x,(unsigned int) ConsoleObject->pos.y,(unsigned int) ConsoleObject->pos.z); - - // Write player orientation. - PHYSFSX_printf(SaveFile, "%8x %8x %8x\n",(unsigned int) ConsoleObject->orient.rvec.x,(unsigned int) ConsoleObject->orient.rvec.y,(unsigned int) ConsoleObject->orient.rvec.z); - PHYSFSX_printf(SaveFile, "%8x %8x %8x\n",(unsigned int) ConsoleObject->orient.uvec.x,(unsigned int) ConsoleObject->orient.uvec.y,(unsigned int) ConsoleObject->orient.uvec.z); - PHYSFSX_printf(SaveFile, "%8x %8x %8x\n",(unsigned int) ConsoleObject->orient.fvec.x,(unsigned int) ConsoleObject->orient.fvec.y,(unsigned int) ConsoleObject->orient.fvec.z); - PHYSFSX_printf(SaveFile, "%i\n", ConsoleObject->segnum); - - PHYSFS_close( SaveFile); - - return 1; -} - -// ----------------------------------------------------------------------------- -int SaveSituation(void) -{ - if (ui_get_filename( sit_filename, "*.SIT", "Save Situation" )) { - set_extension(sit_filename, "MIN"); - if (med_save_mine(sit_filename)) { - return 0; - } - - set_extension(sit_filename, "SIT"); - if (med_save_situation(sit_filename)) - return 0; - } - - return 1; -} - -// ----------------------------------------------------------------------------- -// Load a situation file which consists of x,y,z, orientation matrix, mine name. -int LoadSituation(void) -{ - if (SafetyCheck()) { - if (ui_get_filename( sit_filename, "*.sit", "Load Situation" )) { - checkforext(sit_filename, "SIT"); - if (med_load_situation(sit_filename)) - return 0; - // set_view_target_from_segment(Cursegp); - Update_flags = UF_WORLD_CHANGED; - // SetPlayerFromCurseg(); - med_compress_mine(); - init_info = 1; - mine_changed = 0; - } - } - - return 1; -} - diff --git a/d1x-rebirth/editor/kmine.c b/similar/editor/kmine.c similarity index 100% rename from d1x-rebirth/editor/kmine.c rename to similar/editor/kmine.c