teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-02-28 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Venom mod crash

Browse source
This commit is contained in:
Simon 2020-07-26 20:23:38 +01:00
parent caacaab87d
commit 3430c37d94
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.rtcwquest" package="com.drbeef.rtcwquest"
android:versionCode="20" android:versionCode="21"
android:versionName="0.19.1" android:installLocation="auto" > android:versionName="0.20.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/> <uses-feature android:glEsVersion="0x00030001" android:required="true"/>

2
Projects/Android/jni/rtcw/src/cgame/cg_draw.c
View file

@ -3603,7 +3603,7 @@ void CG_Teleport() {
trace_t trace; trace_t trace;
VectorMA(origin, 256, forward, endForward); VectorMA(origin, 256, forward, endForward);
trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID); trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SHOT);
ci.health = 1; ci.health = 1;
ci.handicap = 128; // value out of 255 for alpha channel ci.handicap = 128; // value out of 255 for alpha channel

2
Projects/Android/jni/rtcw/src/cgame/cg_main.c
View file

@ -383,7 +383,7 @@ cvarTable_t cvarTable[] = {
// END JOSEPH // END JOSEPH
//----(SA) added //----(SA) added
{ &cg_particleDist, "cg_particleDist", "1024", CVAR_ARCHIVE }, { &cg_particleDist, "cg_particleDist", "2048", CVAR_ARCHIVE },
{ &cg_particleLOD, "cg_particleLOD", "0", CVAR_ARCHIVE }, { &cg_particleLOD, "cg_particleLOD", "0", CVAR_ARCHIVE },
{ &cg_useSuggestedWeapons, "cg_useSuggestedWeapons", "1", CVAR_ARCHIVE }, //----(SA) added { &cg_useSuggestedWeapons, "cg_useSuggestedWeapons", "1", CVAR_ARCHIVE }, //----(SA) added
//----(SA) end //----(SA) end

2
Projects/Android/jni/rtcw/src/game/q_shared.h
View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
// q_shared.h -- included first by ALL program modules. // q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file // A user mod should never modify this file
#define Q3_VERSION "RTCWQuest 0.19.1 (Wolf 1.41)" #define Q3_VERSION "RTCWQuest 0.20.0 (Wolf 1.41)"
// ver 1.0.0 - release // ver 1.0.0 - release
// ver 1.0.1 - post-release work // ver 1.0.1 - post-release work
// ver 1.1.0 - patch 1 (12/12/01) // ver 1.1.0 - patch 1 (12/12/01)

6
Projects/Android/jni/rtcw/src/renderer/tr_init.c
View file

@ -1042,8 +1042,8 @@ void R_Register( void ) {
AssertCvarRange( r_picmip, 0, 16, qtrue ); AssertCvarRange( r_picmip, 0, 16, qtrue );
AssertCvarRange( r_picmip2, 0, 16, qtrue ); AssertCvarRange( r_picmip2, 0, 16, qtrue );
r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_texturebits = ri.Cvar_Get( "r_texturebits", "32", CVAR_ARCHIVE | CVAR_LATCH );
r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_colorbits = ri.Cvar_Get( "r_colorbits", "32", CVAR_ARCHIVE | CVAR_LATCH );
r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH );
#if defined ( __linux__ ) #if defined ( __linux__ )
r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
@ -1058,7 +1058,7 @@ void R_Register( void ) {
#else #else
r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH ); r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
#endif #endif
r_depthbits = ri.Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_depthbits = ri.Cvar_Get( "r_depthbits", "24", CVAR_ARCHIVE | CVAR_LATCH );
r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "1", CVAR_ARCHIVE | CVAR_LATCH ); //----(SA) changed this to default to '1' for Drew r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "1", CVAR_ARCHIVE | CVAR_LATCH ); //----(SA) changed this to default to '1' for Drew
r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH ); r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );

5
Projects/Android/jni/rtcw/src/renderer/tr_mesh.c
View file

@ -339,6 +339,11 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
lod = R_ComputeLOD( ent ); lod = R_ComputeLOD( ent );
header = tr.currentModel->md3[lod]; header = tr.currentModel->md3[lod];
if (header == NULL)
{
//Fix issue with VENOM
return;
}
// //
// cull the entire model if merged bounding box of both frames // cull the entire model if merged bounding box of both frames