From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 21 Jun 2022 02:52:11 +0000 (+0200)
Subject: Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f3014d79f98abd19b003327ed7852e8246e0a1e;p=xonotic%2Fnetradiant.git

Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge
---

2f3014d79f98abd19b003327ed7852e8246e0a1e
diff --cc radiant/plugintoolbar.cpp
index 25ff2cd4,e3c8cb95..d0745f4a
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@@ -34,9 -34,9 +34,10 @@@
  #include "plugin.h"
  
  ui::Image new_plugin_image( const char* filename ){
++	// NetRadiantCustom look for AppPath (DataPath) plugins dir before GameToolsPath plugins dir.
  	{
  		StringOutputStream fullpath( 256 );
 -		fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
 +		fullpath << GameToolsPath_get() << g_pluginsDir << "bitmaps/" << filename;
  		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
  	}
  
diff --cc radiant/qe3.cpp
index ab62a919,62530c11..09d49d30
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@@ -223,11 -202,18 +223,19 @@@ void bsp_init()
  	build_set_variable( "ExtraQ3map2Args", ExtraQ3map2Args.c_str() );
  
  	const char* mapname = Map_Name( g_map );
 -	StringOutputStream name( 256 );
 -	name << StringRange( mapname, path_get_filename_base_end( mapname ) ) << ".bsp";
 +	std::string name;
 +	name.append( mapname, path_get_filename_base_end( mapname ) - mapname );
 +	name += ".bsp";
  
- 	build_set_variable( "MapFile", mapname );
+ 	if( region_active ){
+ 		StringOutputStream name( 256 );
+ 		name << StringRange( mapname, path_get_filename_base_end( mapname ) ) << ".reg";
+ 		build_set_variable( "MapFile", name.c_str() );
+ 	}
+ 	else{
+ 		build_set_variable( "MapFile", mapname );
+ 	}
+ 
  	build_set_variable( "BspFile", name.c_str() );
  }
  
diff --cc radiant/xywindow.h
index 6ace2803,dcc5c0ec..071f132c
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@@ -128,10 -128,10 +128,13 @@@ void ZoomIn()
  void ZoomOut();
  void ZoomInWithMouse( int pointx, int pointy );
  
 +void Redraw();
 +
+ void RenderActive();
++
  void SetActive( bool b ){
  	m_bActive = b;
+ 	RenderActive();
  };
  bool Active(){
  	return m_bActive;