* "BrushAlwaysCaulk" option is saveable for brush types other than q3

* brush format is preference for [maptypes, brushtypes]: [mapq1, quake], [mapq2, quake2], [mapq3, quake3]:
		preferences->Brush->Brush type: Axial projection, Brush primitives, Valve 220
	* autodetect brush type on map opening
	* brush face surfaceflags are optional on loading for flexibility
	* 'Snap planes to integer grid' option is always off by default
This commit is contained in:
Garux
2017-09-16 16:37:39 +03:00
parent 4e4b8e1407
commit 0b3f42ffbc
12 changed files with 309 additions and 131 deletions

View File

@@ -41,7 +41,7 @@ typedef bool ( ScriptTokeniser::*Tokenise )( char c );
Tokenise m_stack[3];
Tokenise* m_state;
SingleCharacterInputStream<TextInputStream> m_istream;
SingleCharacterInputStreamDoubleBuffered<TextInputStream> m_istream;
std::size_t m_scriptline;
std::size_t m_scriptcolumn;
@@ -329,6 +329,9 @@ std::size_t getLine() const {
std::size_t getColumn() const {
return m_scriptcolumn;
}
bool bufferContains( const char* str ){
return m_istream.bufferContains( str );
}
};