opengta/OpenGTA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now it starts

Browse Source
This commit is contained in:
Vladislav Khorev 2018-09-14 21:13:23 +05:00
parent 49635589ee
commit beaf57a423
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenGTA-win/OpenGTA-win.vcxproj
View File

@ -42,7 +42,7 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<CLRSupport>false</CLRSupport> <CLRSupport>false</CLRSupport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@ -100,7 +100,7 @@
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<AdditionalLibraryDirectories>..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>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)</AdditionalDependencies> <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)</AdditionalDependencies>
<EntryPointSymbol> <EntryPointSymbol>
</EntryPointSymbol> </EntryPointSymbol>
</Link> </Link>
@ -137,7 +137,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<AdditionalLibraryDirectories>..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\SDL2-2.0.8\lib\x64;..\..\loki-0.1.7\lib;..\..\physfs-3.0.1\build\install\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>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)</AdditionalDependencies> <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)</AdditionalDependencies>
<EntryPointSymbol> <EntryPointSymbol>
</EntryPointSymbol> </EntryPointSymbol>
</Link> </Link>
@ -163,7 +163,7 @@
<ClCompile Include="..\gl_texturecache.cpp" /> <ClCompile Include="..\gl_texturecache.cpp" />
<ClCompile Include="..\id_sys.cpp" /> <ClCompile Include="..\id_sys.cpp" />
<ClCompile Include="..\localplayer.cpp" /> <ClCompile Include="..\localplayer.cpp" />
<ClCompile Include="..\main.cpp" /> <ClCompile Include="..\main2.cpp" />
<ClCompile Include="..\math\obb.cpp" /> <ClCompile Include="..\math\obb.cpp" />
<ClCompile Include="..\math\obox.cpp" /> <ClCompile Include="..\math\obox.cpp" />
<ClCompile Include="..\math\plane.cpp" /> <ClCompile Include="..\math\plane.cpp" />

6
OpenGTA-win/OpenGTA-win.vcxproj.filters
View File

@ -135,9 +135,6 @@
<ClCompile Include="..\math\plane.cpp"> <ClCompile Include="..\math\plane.cpp">
<Filter>Source Files\math</Filter> <Filter>Source Files\math</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\main.cpp">
<Filter>Source Files\ogta</Filter>
</ClCompile>
<ClCompile Include="..\util\sound_resample2.cpp"> <ClCompile Include="..\util\sound_resample2.cpp">
<Filter>Source Files\util</Filter> <Filter>Source Files\util</Filter>
</ClCompile> </ClCompile>
@ -204,6 +201,9 @@
<ClCompile Include="..\opensteer\src\Clock.cpp"> <ClCompile Include="..\opensteer\src\Clock.cpp">
<Filter>Source Files\opensteer</Filter> <Filter>Source Files\opensteer</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\main2.cpp">
<Filter>Source Files\ogta</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\read_ini.h"> <ClInclude Include="..\read_ini.h">

BIN
OpenGTA-win/physfs.dll Executable file
View File

Binary file not shown.

2
common_sdl_gl.cpp
View File

@ -54,7 +54,7 @@ void initVideo(int w, int h, int bpp) {
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
w, h, w, h,
SDL_WINDOW_FULLSCREEN | SDL_WINDOW_OPENGL); SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL);
resize(w, h); resize(w, h);

3
main.cpp
View File

@ -30,7 +30,8 @@ int main(int argc, char* argv[]) {
//Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com //Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com
//SDL_EnableKeyRepeat( 100, SDL_DEFAULT_REPEAT_INTERVAL ); //SDL_EnableKeyRepeat( 100, SDL_DEFAULT_REPEAT_INTERVAL );
. initVideo(1024, 768, 32);
initVideo(1024, 768, 32);
initGL(); initGL();
run_main(); run_main();

7
main2.cpp Normal file → Executable file
View File

@ -1,7 +1,6 @@
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <unistd.h>
#include "m_exceptions.h" #include "m_exceptions.h"
#include "log.h" #include "log.h"
@ -56,10 +55,14 @@ int main(int argc, char* argv[]) {
} }
} }
//Xperimental -- Vladislav Khorev vladislav.khorev@fishrungames.com
/*
if (global_Restart) { if (global_Restart) {
on_exit(); on_exit();
execvp(argv[0], argv); execvp(argv[0], argv);
} }*/
std::exit(0); std::exit(0);
} }

4
viewer.cpp
View File

@ -56,7 +56,7 @@
#define removePedById removePed #define removePedById removePed
#define addPed add #define addPed add
extern SDL_Window* screen; SDL_Window* screen;
extern int global_EC; extern int global_EC;
extern int global_Done; extern int global_Done;
extern int global_Restart; extern int global_Restart;
@ -66,7 +66,7 @@ OpenGTA::CityView *city = NULL;
//OpenGL::DrawableFont* m_font = NULL; //OpenGL::DrawableFont* m_font = NULL;
GUI::Label * fps_label = 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_8[3] = { "STYLE001.GRY", "STYLE002.GRY", "STYLE003.GRY" };
const char* styles_24[3] = { "STYLE001.G24", "STYLE002.G24", "STYLE003.G24" }; const char* styles_24[3] = { "STYLE001.G24", "STYLE002.G24", "STYLE003.G24" };