diff --git a/common/include/editor/editor.h b/common/include/editor/editor.h index 4d788c925..9129de9ff 100644 --- a/common/include/editor/editor.h +++ b/common/include/editor/editor.h @@ -182,7 +182,6 @@ extern struct tm Editor_time_of_day; extern int SegSizeMode; // Mode = 0/1 = not/is legal to move bound vertices, void init_editor(void); -void close_editor(void); // Initialize all vertices to inactive status. extern void init_all_vertices(void); diff --git a/d1x-rebirth/main/bmread.cpp b/d1x-rebirth/main/bmread.cpp index ada79e8ad..0fa3c8404 100644 --- a/d1x-rebirth/main/bmread.cpp +++ b/d1x-rebirth/main/bmread.cpp @@ -115,7 +115,7 @@ static sbyte bm_flag = BM_NONE; static int abm_flag = 0; static int rod_flag = 0; static short wall_open_sound, wall_close_sound,wall_explodes,wall_blastable, wall_hidden; -float vlighting=0; +static float vlighting=0; static int obj_eclip; static int dest_vclip; //what vclip to play when exploding static int dest_eclip; //what eclip to play when exploding diff --git a/d2x-rebirth/main/bmread.cpp b/d2x-rebirth/main/bmread.cpp index 8c67acace..6cee8e7c0 100644 --- a/d2x-rebirth/main/bmread.cpp +++ b/d2x-rebirth/main/bmread.cpp @@ -109,7 +109,7 @@ static sbyte bm_flag = BM_NONE; static int abm_flag = 0; static int rod_flag = 0; static short wall_open_sound, wall_close_sound,wall_explodes,wall_blastable, wall_hidden; -float vlighting=0; +static float vlighting=0; static int obj_eclip; static char *dest_bm; //clip number to play when destroyed static int dest_vclip; //what vclip to play when exploding diff --git a/similar/editor/med.cpp b/similar/editor/med.cpp index 1e4be1f17..f11f6441d 100644 --- a/similar/editor/med.cpp +++ b/similar/editor/med.cpp @@ -344,8 +344,6 @@ void init_editor() init_autosave(); -// atexit(close_editor); - Clear_window = 1; // do full window clear. InitCurve(); @@ -817,8 +815,9 @@ int SafetyCheck() } //called at the end of the program -void close_editor() { +static void close_editor() +{ // _MARK_("end of editor");//Nuked to compile -KRB #ifndef __linux__