aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/glk/jacl/glk_startup.cpp166
-rw-r--r--engines/glk/jacl/jacl_main.cpp1
-rw-r--r--engines/glk/module.mk1
3 files changed, 1 insertions, 167 deletions
diff --git a/engines/glk/jacl/glk_startup.cpp b/engines/glk/jacl/glk_startup.cpp
deleted file mode 100644
index b49a6cd0f5..0000000000
--- a/engines/glk/jacl/glk_startup.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "glk/jacl/jacl.h"
-#include "glk/jacl/constants.h"
-#include "glk/jacl/language.h"
-#include "glk/jacl/prototypes.h"
-#include "glk/jacl/version.h"
-#include "glk/glk_api.h"
-#include "glk/streams.h"
-
-namespace Glk {
-namespace JACL {
-
-int jpp_error = FALSE;
-
-extern strid_t game_stream;
-extern char game_file[];
-extern char temp_buffer[];
-extern char error_buffer[];
-extern char processed_file[];
-
-short int encrypt;
-extern short int release;
-
-struct glkunix_startup_t {
- int argc;
- char **argv;
-};
-
-struct glkunix_argumentlist_t {
- const char *_switch;
- int _value;
- const char *_description;
-};
-
-glkunix_startup_t *arguments;
-
-/* THE STREAM FOR OPENING UP THE ARCHIVE CONTAINING GRAPHICS AND SOUND */
-extern strid_t blorb_stream;
-
-/* PROTOTYPE FOR NEEDED UTILITY FUNCTION */
-void create_paths();
-
-#ifdef UNUSED
-glkunix_argumentlist_t glkunix_arguments[] = {
- {"", glkunix_arg_ValueFollows, "filename: The game file to load." },
-
- {"-noencrypt", glkunix_arg_NoValue, "-noencrypt: Don't encrypt the processed game file."},
- {"-release", glkunix_arg_NoValue, "-release: Don't include the debug libraries in the .j2 file."},
- { NULL, glkunix_arg_End, NULL }
-};
-
-int glkunix_startup_code(glkunix_startup_t *data) {
- int index = 0;
-
- arguments = data;
-
-#ifdef GARGLK
- sprintf(temp_buffer, "JACL %d.%d.%d", J_VERSION, J_RELEASE, J_BUILD);
- garglk_set_program_name(temp_buffer);
- sprintf(temp_buffer, "JACL %d.%d.%d by Stuart Allen.\n", J_VERSION, J_RELEASE, J_BUILD);
- garglk_set_program_info(temp_buffer);
-#endif
-
- /* YOU CAN PUT OTHER STARTUP CODE IN glkunix_startup_code(). THIS SHOULD
- * GENERALLY BE LIMITED TO FINDING AND OPENING DATA FILES. */
-
- if (arguments->argc == 1) {
- sprintf(error_buffer, "%s^", NO_GAME);
- jpp_error = TRUE;
-
- /* WE NEED TO RETURN TRUE HERE SO THE INTERPRETER WILL OPEN A
- * GLK WINDOWS TO DISPLAY THE ERROR MESSAGE IN */
- return (TRUE);
- } else {
- strcpy(temp_buffer, arguments->argv[1]);
-
- /* THERE IS AT LEAST ONE ARGUMENT, POSSIBLY JUST THE GAME FILE, BUT
- * LOOK THROUGH THE LIST FOR ANYTHING THAT NEEDS ACTING ON */
- for (index = 0; index < data->argc; index++) {
- if (!strcmp(*data->argv, "-noencrypt")) {
- encrypt = FALSE;
- } else if (!strcmp(*data->argv, "-release")) {
- release = TRUE;
- }
-
- /* INCREMENT THE POINTER TO THE NEXT ARGUMENT */
- data->argv++;
- }
- }
-
- /* SETUP ALL THE EXPECTED PATHS */
- //create_paths(temp_buffer);
-
- /* PREPROCESS THE FILE AND WRITE IT OUT TO THE NEW FILE */
- /* WARNING: THIS FUNCTION USES stdio FUNCTIONS TO CREATE FILES
- * IN SUBDIRECTORIES. IT IS PORTABLE ACROSS MODERN DESKTOPS, IE
- * WINDOWS, MAC, UNIX ETC, BUT IT'S NOT GLK CODE... */
- if (jpp() == FALSE) {
- jpp_error = TRUE;
-
- /* WE NEED TO RETURN TRUE HERE SO THE INTERPRETER WILL OPEN A
- * GLK WINDOWS TO DISPLAY THE ERROR MESSAGE IN */
- return (TRUE);
- }
-
- /* THIS OPENS AN ARBITRARY FILE, IN READ-ONLY MODE. NOTE THAT THIS FUNCTION
- * IS *ONLY* AVAILABLE DURING glkunix_startup_code(). IT IS INHERENT
- * NON-PORTABLE; IT SHOULD NOT AND CANNOT BE CALLED FROM INSIDE
- * glk_main() NOTE: The middle argument FALSE indicates a binary file. */
- game_stream = glkunix_stream_open_pathname(processed_file, FALSE, 0);
-
- if (!game_stream) {
- strcpy(error_buffer, NOT_FOUND);
- jpp_error = TRUE;
-
- /* WE NEED TO RETURN TRUE HERE SO THE INTERPRETER WILL OPEN A
- * GLK WINDOWS TO DISPLAY THE ERROR MESSAGE IN */
- return (TRUE);
- }
-
- /* SET THE LIBRARY'S IDEA OF THE "CURRENT DIRECTORY" FOR THE EXECUTING
- * PROGRAM. THE ARGUMENT SHOULD BE THE NAME OF A FILE (NOT A DIRECTORY).
- * WHEN THIS IS SET, fileref_create_by_name() WILL CREATE FILES IN THE SAME
- * DIRECTORY AS THAT FILE, AND create_by_prompt() WILL BASE DEFAULT
- * FILENAMES OFF OF THE FILE. IF THIS IS NOT CALLED, THE LIBRARY WORKS IN
- * THE UNIX CURRENT WORKING DIRECTORY, AND PICKS REASONABLE DEFAULT
- * DEFAULTS. */
- glkunix_set_base_file(game_file);
-
- /* Set title of game */
-#ifdef GARGLK
- char *s;
- s = strrchr(game_file, '\\');
- if (!s) s = strrchr(game_file, '/');
- garglk_set_story_name(s ? s + 1 : game_file);
-#endif
-
- /* RETURN TRUE ERRORS OR NOT SO THE MAIN WINDOWS CAN BE OPENED AND
- * ANY ERROR MESSAGE DISPLAYED */
- return (TRUE);
-}
-#endif
-
-} // End of namespace JACL
-} // End of namespace Glk
diff --git a/engines/glk/jacl/jacl_main.cpp b/engines/glk/jacl/jacl_main.cpp
index bc8690afcc..9059482ff1 100644
--- a/engines/glk/jacl/jacl_main.cpp
+++ b/engines/glk/jacl/jacl_main.cpp
@@ -102,6 +102,7 @@ int start_of_last_command;
int start_of_this_command;
int objects, integers, functions, strings;
+int jpp_error = FALSE;
/* A STREAM FOR THE GAME FILE, WHEN IT'S OPEN. */
strid_t game_stream = NULL;
diff --git a/engines/glk/module.mk b/engines/glk/module.mk
index b3a88ea6bd..b9deea33bf 100644
--- a/engines/glk/module.mk
+++ b/engines/glk/module.mk
@@ -183,7 +183,6 @@ MODULE_OBJS := \
jacl/errors.o \
jacl/findroute.o \
jacl/glk_saver.o \
- jacl/glk_startup.o \
jacl/interpreter.o \
jacl/jacl.o \
jacl/jacl_main.o \