diff --git a/OpenGTA-win/OpenGTA-win.vcxproj b/OpenGTA-win/OpenGTA-win.vcxproj index d6b6555..5eb775b 100755 --- a/OpenGTA-win/OpenGTA-win.vcxproj +++ b/OpenGTA-win/OpenGTA-win.vcxproj @@ -42,7 +42,7 @@ Application true v141 - Unicode + MultiByte false @@ -100,7 +100,7 @@ Console ..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib - physfs-static.lib;loki_D.lib;SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + physfs.lib;loki_D.lib;SDL2.lib;SDL2main.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -137,7 +137,7 @@ true Console ..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib - physfs-static.lib;loki_D.lib;SDL2.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + physfs.lib;loki_D.lib;SDL2.lib;opengl32.lib;glu32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -163,7 +163,7 @@ - + diff --git a/OpenGTA-win/OpenGTA-win.vcxproj.filters b/OpenGTA-win/OpenGTA-win.vcxproj.filters index 4a2289c..99273c6 100755 --- a/OpenGTA-win/OpenGTA-win.vcxproj.filters +++ b/OpenGTA-win/OpenGTA-win.vcxproj.filters @@ -135,9 +135,6 @@ Source Files\math - - Source Files\ogta - Source Files\util @@ -204,6 +201,9 @@ Source Files\opensteer + + Source Files\ogta + diff --git a/OpenGTA-win/physfs.dll b/OpenGTA-win/physfs.dll new file mode 100755 index 0000000..3daae30 Binary files /dev/null and b/OpenGTA-win/physfs.dll differ diff --git a/common_sdl_gl.cpp b/common_sdl_gl.cpp index eea6a95..79972b6 100755 --- a/common_sdl_gl.cpp +++ b/common_sdl_gl.cpp @@ -54,7 +54,7 @@ void initVideo(int w, int h, int bpp) { SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, - SDL_WINDOW_FULLSCREEN | SDL_WINDOW_OPENGL); + SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL); resize(w, h); diff --git a/main.cpp b/main.cpp index 4579356..88e22fe 100755 --- a/main.cpp +++ b/main.cpp @@ -30,7 +30,8 @@ int main(int argc, char* argv[]) { //Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com //SDL_EnableKeyRepeat( 100, SDL_DEFAULT_REPEAT_INTERVAL ); - . initVideo(1024, 768, 32); + + initVideo(1024, 768, 32); initGL(); run_main(); diff --git a/main2.cpp b/main2.cpp old mode 100644 new mode 100755 index 9b048e3..c064b1d --- a/main2.cpp +++ b/main2.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include "m_exceptions.h" #include "log.h" @@ -56,10 +55,14 @@ int main(int argc, char* argv[]) { } } + + //Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com + + /* if (global_Restart) { on_exit(); execvp(argv[0], argv); - } + }*/ std::exit(0); } diff --git a/viewer.cpp b/viewer.cpp index 15f9f78..cf5ebac 100755 --- a/viewer.cpp +++ b/viewer.cpp @@ -56,7 +56,7 @@ #define removePedById removePed #define addPed add -extern SDL_Window* screen; +SDL_Window* screen; extern int global_EC; extern int global_Done; extern int global_Restart; @@ -66,7 +66,7 @@ OpenGTA::CityView *city = NULL; //OpenGL::DrawableFont* m_font = NULL; GUI::Label * fps_label = NULL; -extern int city_num; //In main.cpp - Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com +int city_num; const char* styles_8[3] = { "STYLE001.GRY", "STYLE002.GRY", "STYLE003.GRY" }; const char* styles_24[3] = { "STYLE001.G24", "STYLE002.G24", "STYLE003.G24" };