From 3a2194a534725d9e263b6f2af11ad8b6ef8ecc67 Mon Sep 17 00:00:00 2001 From: Kester Maddock Date: Sat, 24 Apr 2004 06:29:51 +0000 Subject: [PATCH] Remove ability to open a published executable from Blender. --- .../blender/blenloader/intern/readblenentry.c | 6 ------ .../readblenfile/intern/BLO_readblenfile.c | 2 +- .../gameengine/GamePlayer/ghost/GPG_ghost.cpp | 18 ++++++++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index bf4a634e8ed..a008142be66 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -251,12 +251,6 @@ BlendFileData *BLO_read_from_file(char *file, BlendReadError *error_r) { strcpy(bfd->main->name, file); } blo_freefiledata(fd); - } else if (blo_is_a_runtime(file)) { - bfd= blo_read_runtime(file, error_r); - if (bfd) { - bfd->type= BLENFILETYPE_RUNTIME; - strcpy(bfd->main->name, file); - } } return bfd; diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c index 698fed79842..7fdad840895 100644 --- a/source/blender/readblenfile/intern/BLO_readblenfile.c +++ b/source/blender/readblenfile/intern/BLO_readblenfile.c @@ -161,7 +161,7 @@ blo_read_runtime( *error_r= BRE_NOT_A_BLEND; goto cleanup; } else { - printf("starting to read runtime from %s at datastart %d\n", path, datastart); + //printf("starting to read runtime from %s at datastart %d\n", path, datastart); lseek(fd, datastart, SEEK_SET); bfd = blo_read_blendafterruntime(fd, actualsize-datastart, error_r); } diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index acdf3027f19..897fb4f27cd 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -63,6 +63,7 @@ extern "C" #include "BLI_blenlib.h" #include "DNA_scene_types.h" #include "BLO_readfile.h" +#include "BLO_readblenfile.h" int GHOST_HACK_getFirstFile(char buf[]); @@ -175,14 +176,19 @@ char *get_filename(int argc, char **argv) { BlendFileData *load_game_data(char *progname, char *filename) { BlendReadError error; - BlendFileData *bfd; + BlendFileData *bfd = NULL; /* try to load ourself, will only work if we are a runtime */ - bfd= BLO_read_from_file(progname, &error); - - if (!bfd) { + if (blo_is_a_runtime(progname)) { + bfd= blo_read_runtime(progname, &error); + } + if (bfd) { + bfd->type= BLENFILETYPE_RUNTIME; + strcpy(bfd->main->name, progname); + } else { if (filename) { - bfd= BLO_read_from_file(filename, &error); + return load_game_data(filename, NULL); +// bfd= BLO_read_from_file(filename, &error); } } @@ -566,7 +572,7 @@ int main(int argc, char** argv) { system->processEvents(false); system->dispatchEvents(); - if (exitcode = app.getExitRequested()) + if ((exitcode = app.getExitRequested())) { run = false; exitstring = app.getExitString();