diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-02-13 06:37:00 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-02-13 06:37:00 +0300 |
| commit | 6c325d74f534d259820c2b2d94d5b73b3acf0a35 (patch) | |
| tree | 522e443698e13c385c35df57781499fb0d128931 /source/gameengine/GamePlayer/ghost | |
| parent | 4c966a31419313e88e91d60ea6a6356df27dc9b1 (diff) | |
gameplayer will use blender materials automatically
Diffstat (limited to 'source/gameengine/GamePlayer/ghost')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 2ab98750881..8de9e5784fe 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -494,11 +494,12 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0); bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0); bool useVertexArrays = SYS_GetCommandLineInt(syshandle,"vertexarrays",1) != 0; - + #ifdef GL_ARB_multitexture + int gameflag =(G.fileflags & G_FILE_GAME_MAT); // ---------------------------------- if(bgl::RAS_EXT_support._ARB_multitexture && bgl::QueryVersion(1, 1)) { - m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", 0) != 0); + m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", gameflag) != 0); int unitmax=0; glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&unitmax); bgl::max_texture_units = MAXTEX>unitmax?unitmax:MAXTEX; diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 5b67f8b8029..79a5171eec5 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -59,7 +59,7 @@ extern "C" { #endif // __cplusplus - +#include "BKE_global.h" #include "BLI_blenlib.h" #include "DNA_scene_types.h" #include "BLO_readfile.h" @@ -605,7 +605,7 @@ int main(int argc, char** argv) #ifdef NDEBUG if (closeConsole) { - ::FreeConsole(); // Close a console window + //::FreeConsole(); // Close a console window } #endif // NDEBUG #endif // WIN32 @@ -613,7 +613,8 @@ int main(int argc, char** argv) Scene *scene = bfd->curscene; strcpy (pathname, maggie->name); char *startscenename = scene->id.name + 2; - + G.fileflags = bfd->fileflags; + titlename = maggie->name; // Check whether the game should be displayed full-screen |