quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix for bug 1106 - .wad files don't get listed in the textures menu (Shaderman)

Browse Source 
(http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1106)
- Added initial support for Prey (Shaderman)
- Fixed entity inspector sliders to always show (Shaderman)
- Added NOTES subsection to the entity inspector listing .def editor_usage* values (Shaderman)



git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@114 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
namespace
2006-10-08 21:13:50 +00:00
parent 8d4bd599b6
commit d403cec8ee
6 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
radiant/eclass_doom3.cpp
View File

@@ -452,12 +452,12 @@ static bool EntityClass_parse(EntityClass& entityClass, Tokeniser& tokeniser)
}
else if(string_equal_n(key, "editor_usage", 12))
{
usage << "\n";
PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseString(tokeniser, usage));
currentString = &usage;
}
else if(string_equal(key, "editor_rotatable")
|| string_equal(key, "editor_showangle")
|| string_equal(key, "editor_showangles") // typo? in prey movables.def
|| string_equal(key, "editor_mover")
|| string_equal(key, "editor_model")
|| string_equal(key, "editor_material")
@@ -556,6 +556,17 @@ static bool EntityClass_parse(EntityClass& entityClass, Tokeniser& tokeniser)
PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseToken(tokeniser));
}
// end quake4-specific keys
// begin ignore prey (unknown/unused?) entity keys
else if(string_equal(key, "editor_light")
|| string_equal(key, "editor_def def_debrisspawner")
|| string_equal(key, "editor_def def_drop")
|| string_equal(key, "editor_def def_guihand")
|| string_equal(key, "editor_def def_mine"))
{
//const char* value =
PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseToken(tokeniser));
}
// end ignore prey entity keys
else
{
CopiedString tmp(key);
@@ -794,7 +805,14 @@ public:
StringOutputStream usage(256);
usage << "-------- KEYS --------\n";
usage << "-------- NOTES --------\n";
if(!string_empty((*i).second->m_comments.c_str()))
{
usage << (*i).second->m_comments.c_str() << "\n";
}
usage << "\n-------- KEYS --------\n";
for(EntityClassAttributes::iterator j = (*i).second->m_attributes.begin(); j != (*i).second->m_attributes.end(); ++j)
{