re-diff'ed an extra patch under Misc/ so that it applies cleanly.

sezero · Sep 1, 2023 · c8cee0f · c8cee0f
1 parent 1c94763
commit c8cee0f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Misc/fix_externaltex.patch b/Misc/fix_externaltex.patch
@@ -79,7 +79,7 @@ index 239d361..80948f1 100644
  				data = Image_LoadImage (filename, &fwidth, &fheight);
  				if (!data)
 diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
-index 76c5a9f..0048138 100644
+index 6883161..4a8a745 100644
 --- a/Quake/gl_rmain.c
 +++ b/Quake/gl_rmain.c
 @@ -100,6 +100,8 @@ cvar_t	r_noshadow_list = {"r_noshadow_list", "progs/flame2.mdl,progs/flame.mdl,p
@@ -92,7 +92,7 @@ index 76c5a9f..0048138 100644
 
  cvar_t	r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE};
 diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c
-index 0c458e3..55511ff 100644
+index 93791f6..4006c5d 100644
 --- a/Quake/gl_rmisc.c
 +++ b/Quake/gl_rmisc.c
 @@ -47,6 +47,7 @@ extern cvar_t r_nolerp_list;
@@ -103,11 +103,11 @@ index 0c458e3..55511ff 100644
 
  extern gltexture_t *playertextures[MAX_SCOREBOARD]; //johnfitz
 
-@@ -219,6 +220,7 @@ void R_Init (void)
- 	Cvar_RegisterVariable (&r_noshadow_list);
- 	Cvar_SetCallback (&r_noshadow_list, R_Model_ExtraFlags_List_f);
- 	//johnfitz
-+	Cvar_RegisterVariable (&r_externaltexture_fix); //mk
+@@ -231,6 +232,7 @@ void R_Init (void)
+ 	Cvar_SetCallback (&r_lavaalpha, R_SetLavaalpha_f);
+ 	Cvar_SetCallback (&r_telealpha, R_SetTelealpha_f);
+ 	Cvar_SetCallback (&r_slimealpha, R_SetSlimealpha_f);
++	Cvar_RegisterVariable (&r_externaltexture_fix);//mk
 
- 	Cvar_RegisterVariable (&gl_zfix); // QuakeSpasm z-fighting fix
- 	Cvar_RegisterVariable (&r_lavaalpha);
+ 	R_InitParticles ();
+ 	R_SetClearColor_f (&r_clearcolor); //johnfitz