sync menu

Velaron · Mar 28, 2022 · 289ea36 · 289ea36
1 parent da2faaa
commit 289ea36
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,4 +7,4 @@
 	branch = tf15-client
 [submodule "particleman"]
 	path = particleman
-	url = https://github.com/Velaron/OpenHL-Particleman
+	url = https://github.com/Velaron/particleman
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.1.0'
+		classpath 'com.android.tools.build:gradle:7.1.1'
 	}
 }
 

diff --git a/common/gameinfo.h b/common/gameinfo.h
@@ -18,6 +18,7 @@ GNU General Public License for more details.
 
 #define GFL_NOMODELS	(1<<0)
 #define GFL_NOSKILLS	(1<<1)
+#define GFL_RENDER_PICBUTTON_TEXT   (1<<2)
 
 /*
 ========================================================================

diff --git a/engine/menu_int.h b/engine/menu_int.h
@@ -212,6 +212,8 @@ typedef struct ui_extendedfuncs_s {
 	double (*pfnDoubleTime)( void );
 
 	char *(*pfnParseFile)( char *data, char *buf, const int size, unsigned int flags, int *len );
+
+	const char	*(*pfnAdrToString)( const struct netadr_s a );
 } ui_extendedfuncs_t;
 
 // deprecated export from old engine

diff --git a/mainui b/mainui
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ buildscript { @@
     	}
     	dependencies {
-    		classpath 'com.android.tools.build:gradle:7.1.0'
+    		classpath 'com.android.tools.build:gradle:7.1.1'
     	}
     }
@@ Expand Down @@
+2 −0		BaseMenu.cpp
+1 −1		BaseMenu.h
+11 −0		Primitive.h
+1 −2		WindowSystem.h
+1 −1		controls/BaseWindow.h
+0 −14		controls/Bitmap.cpp
+0 −24		controls/Bitmap.h
+3 −0		controls/Field.cpp
+95 −0		controls/Framework.cpp
+21 −2		controls/Framework.h
+46 −1		controls/PicButton.cpp
+2 −0		controls/PicButton.h
+3 −0		enginecallback_menu.h
+1 −1		font/FontManager.cpp
+0 −3		menus/Controls.cpp
+8 −3		menus/ServerBrowser.cpp