radiant: add optional pakpath support

[xonotic/netradiant.git] / radiant / mainframe.h

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index 2c003af46ad9f3b2cb3167c330fcac30d737f039..9bf53f6897a0ec323c131ab7788cc22be9e80308 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -103,10 +103,10 @@ void OnSleep();
 void SetStatusText( CopiedString& status_text, const char* pText );
 void UpdateStatusText();
 void RedrawStatusText();
 void SetStatusText( CopiedString& status_text, const char* pText );
 void UpdateStatusText();
 void RedrawStatusText();

-typedef MemberCaller<MainFrame, &MainFrame::RedrawStatusText> RedrawStatusTextCaller;
+typedef MemberCaller<MainFrame, void(), &MainFrame::RedrawStatusText> RedrawStatusTextCaller;

 
 void SetGridStatus();
 
 void SetGridStatus();

-typedef MemberCaller<MainFrame, &MainFrame::SetGridStatus> SetGridStatusCaller;
+typedef MemberCaller<MainFrame, void(), &MainFrame::SetGridStatus> SetGridStatusCaller;

 
 void SetActiveXY( XYWnd* p );
 XYWnd* ActiveXY(){
 
 void SetActiveXY( XYWnd* p );
 XYWnd* ActiveXY(){


@@ -164,8 +164,7 @@ void GLWindow_Destroy();
 extern glwindow_globals_t g_glwindow_globals;
 template<typename Value>
 class LatchedValue;
 extern glwindow_globals_t g_glwindow_globals;
 template<typename Value>
 class LatchedValue;

-typedef LatchedValue<bool> LatchedBool;
-extern LatchedBool g_Layout_enableDetachableMenus;
+extern LatchedValue<bool> g_Layout_enableDetachableMenus;

 
 void deleteSelection();
 
 
 void deleteSelection();
 


@@ -206,6 +205,10 @@ void EnginePath_verify();
 const char* EnginePath_get();
 const char* QERApp_GetGamePath();
 
 const char* EnginePath_get();
 const char* QERApp_GetGamePath();
 

+const int g_pakPathCount = 5;
+extern CopiedString g_strPakPath[g_pakPathCount];
+const char* PakPath_get( int num );
+

 extern CopiedString g_strAppPath;
 const char* AppPath_get();
 
 extern CopiedString g_strAppPath;
 const char* AppPath_get();