From 931b944cbaae41dc1cc600204f7bd3dee5832b78 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */editor/kgame.c -> similar/editor/kgame.c --- SConstruct | 3 +- d2x-rebirth/editor/kgame.c | 167 ------------------------ {d1x-rebirth => similar}/editor/kgame.c | 0 3 files changed, 1 insertion(+), 169 deletions(-) delete mode 100644 d2x-rebirth/editor/kgame.c rename {d1x-rebirth => similar}/editor/kgame.c (100%) diff --git a/SConstruct b/SConstruct index 9deeff7ee..1b2298ec1 100644 --- a/SConstruct +++ b/SConstruct @@ -371,6 +371,7 @@ class DXXProgram(DXXCommon): 'editor/kbuild.c', 'editor/kcurve.c', 'editor/kfuncs.c', +'editor/kgame.c', 'editor/khelp.c', 'editor/kmine.c', 'editor/ksegmove.c', @@ -625,7 +626,6 @@ class D1XProgram(DXXProgram): 'editor/centers.c', 'editor/ehostage.c', 'editor/group.c', -'editor/kgame.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', @@ -764,7 +764,6 @@ class D2XProgram(DXXProgram): editor_sources = [os.path.join(srcdir, f) for f in [ 'editor/centers.c', 'editor/group.c', -'editor/kgame.c', 'editor/ksegsize.c', 'editor/med.c', 'editor/meddraw.c', diff --git a/d2x-rebirth/editor/kgame.c b/d2x-rebirth/editor/kgame.c deleted file mode 100644 index c3af09399..000000000 --- a/d2x-rebirth/editor/kgame.c +++ /dev/null @@ -1,167 +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. -*/ - -/* - * - * Game Loading editor functions - * - */ - - -#include -#include - -#include "inferno.h" -#include "editor.h" -#include "ui.h" -#include "game.h" -#include "gamesave.h" -#include "gameseq.h" - -char game_filename[PATH_MAX] = "*." DXX_LEVEL_FILE_EXTENSION; - -extern void checkforext( char * f, char *ext ); - -void checkforgamext( char * f ) -{ - int i; - - for (i=1; ipos; - Perm_player_orient = ConsoleObject->orient; - Perm_player_segnum = ConsoleObject->segnum; - - editor_status("Player initial position set"); - return 0; -} - -// Save game -// returns 1 if successful -// returns 0 if unsuccessful -int SaveGameData() -{ - char Message[200]; - - if (gamestate_not_restored) { - sprintf( Message, "Game State has not been restored...\nContinue?\n"); - if (ui_messagebox( -2, -2, 2, Message, "NO", "Yes" )==1) - return 0; - } - - if (ui_get_filename( game_filename, "*." DXX_LEVEL_FILE_EXTENSION, "SAVE GAME" )) { - int saved_flag; - vms_vector save_pos = ConsoleObject->pos; - vms_matrix save_orient = ConsoleObject->orient; - int save_segnum = ConsoleObject->segnum; - - checkforgamext(game_filename); - - if (Perm_player_segnum > Highest_segment_index) - Perm_player_segnum = -1; - - if (Perm_player_segnum!=-1) { - if (get_seg_masks(&Perm_player_position, Perm_player_segnum, 0, __FILE__, __LINE__).centermask == 0) - { - ConsoleObject->pos = Perm_player_position; - obj_relink(ConsoleObject-Objects,Perm_player_segnum); - ConsoleObject->orient = Perm_player_orient; - } - else - Perm_player_segnum=-1; //position was bogus - } - saved_flag=save_level(game_filename); - if (Perm_player_segnum!=-1) { - int found_save_segnum; - - if (save_segnum > Highest_segment_index) - save_segnum = 0; - - ConsoleObject->pos = save_pos; - found_save_segnum = find_point_seg(&save_pos,save_segnum); - if (found_save_segnum == -1) { - compute_segment_center(&save_pos, &(Segments[save_segnum])); - found_save_segnum = save_segnum; - } - - obj_relink(ConsoleObject-Objects,found_save_segnum); - ConsoleObject->orient = save_orient; - } - if (saved_flag) - return 0; - mine_changed = 0; - } - return 1; -} - -// returns 1 if successful -// returns 0 if unsuccessful -int LoadGameData() -{ -if (SafetyCheck()) { - if (ui_get_filename( game_filename, "*." DXX_LEVEL_FILE_EXTENSION, "LOAD GAME" )) - { - checkforgamext(game_filename); - if (load_level(game_filename)) - return 0; - Current_level_num = 0; //not a real level - gamestate_not_restored = 0; - Update_flags = UF_WORLD_CHANGED; - Perm_player_position = ConsoleObject->pos; - Perm_player_orient = ConsoleObject->orient; - Perm_player_segnum = ConsoleObject->segnum; - } - } - return 1; -} - -//called whenever a new mine is created, so new mine doesn't get name -//of last saved mine as default -void ResetFilename() -{ - strcpy(game_filename,"*.LVL"); -} - diff --git a/d1x-rebirth/editor/kgame.c b/similar/editor/kgame.c similarity index 100% rename from d1x-rebirth/editor/kgame.c rename to similar/editor/kgame.c