ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-25 10:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed const inconsistencies

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@13 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-02-19 17:05:45 +00:00
parent 0dbba8bc3f
commit 3e31765bd7
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gen.vcproj
View file

@ -137,6 +137,9 @@
Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/> Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\svn.py">
</File>
<File <File
RelativePath=".\include\version.default"> RelativePath=".\include\version.default">
</File> </File>

19
makeversion.py
View file

@ -54,25 +54,25 @@ def get_version():
return (line, major, minor) return (line, major, minor)
# you can pass an optional message to append to aboutmsg # you can pass an optional message to append to aboutmsg
def radiant_makeversion(append_about): def radiant_makeversion(append_about, root = os.getcwd()):
(line, major, minor) = get_version() (line, major, minor) = get_version()
f = open('include/version.h', 'w') f = open(os.path.join(root, 'include/version.h'), 'w')
f.write('// generated header, see makeversion.py\n') f.write('// generated header, see makeversion.py\n')
f.write('#define RADIANT_VERSION "%s"\n' % line) f.write('#define RADIANT_VERSION "%s"\n' % line)
f.write('#define RADIANT_MINOR_VERSION "%s"\n' % minor) f.write('#define RADIANT_MINOR_VERSION "%s"\n' % minor)
f.write('#define RADIANT_MAJOR_VERSION "%s"\n' % major) f.write('#define RADIANT_MAJOR_VERSION "%s"\n' % major)
f.close() f.close()
f = open('include/RADIANT_MINOR', 'w') f = open(os.path.join(root, 'include/RADIANT_MINOR'), 'w')
f.write(minor) f.write(minor)
f.close() f.close()
f = open('include/RADIANT_MAJOR', 'w') f = open(os.path.join(root, 'include/RADIANT_MAJOR'), 'w')
f.write(major) f.write(major)
f.close() f.close()
f = open('include/version', 'w') f = open(os.path.join(root, 'include/version'), 'w')
f.write(line) f.write(line)
f.close() f.close()
# aboutmsg # aboutmsg
aboutfile = 'include/aboutmsg.default' aboutfile = os.path.join(root, 'include/aboutmsg.default')
if ( os.environ.has_key('RADIANT_ABOUTMSG') ): if ( os.environ.has_key('RADIANT_ABOUTMSG') ):
aboutfile = os.environ['RADIANT_ABOUTMSG'] aboutfile = os.environ['RADIANT_ABOUTMSG']
line = None line = None
@ -87,11 +87,14 @@ def radiant_makeversion(append_about):
if ( not append_about is None ): if ( not append_about is None ):
line += append_about line += append_about
sys.stdout.write("about: %s\n" % line) sys.stdout.write("about: %s\n" % line)
f = open('include/aboutmsg.h', 'w') f = open(os.path.join(root, 'include/aboutmsg.h'), 'w')
f.write('// generated header, see makeversion.py\n') f.write('// generated header, see makeversion.py\n')
f.write('#define RADIANT_ABOUTMSG "%s"\n' % line) f.write('#define RADIANT_ABOUTMSG "%s"\n' % line)
f.close() f.close()
# can be used as module (scons build), or by direct call # can be used as module (scons build), or by direct call
if __name__ == '__main__': if __name__ == '__main__':
radiant_makeversion(None) root = os.path.dirname(__file__)
if not os.path.isabs(root):
root = os.getcwd()
radiant_makeversion(None, root)

4
radiant/eclass_def.cpp
View file

@ -168,8 +168,8 @@ void setSpecialLoad(EntityClass *e, const char* pWhat, CopiedString& p)
// Hydra: removed some amazingly bad cstring usage, whoever wrote that // Hydra: removed some amazingly bad cstring usage, whoever wrote that
// needs to be taken out and shot. // needs to be taken out and shot.
char *pText = 0; const char *pText = 0;
char *where = 0; const char *where = 0;
where = strstr(e->comments(),pWhat); where = strstr(e->comments(),pWhat);
if (!where) if (!where)

2
radiant/renderstate.cpp
View file

@ -1678,7 +1678,7 @@ public:
{ {
ASSERT_MESSAGE(!m_traverseRenderablesMutex, "for-each during traversal"); ASSERT_MESSAGE(!m_traverseRenderablesMutex, "for-each during traversal");
m_traverseRenderablesMutex = true; m_traverseRenderablesMutex = true;
for(Renderables::iterator i = m_renderables.begin(); i != m_renderables.end(); ++i) for(Renderables::const_iterator i = m_renderables.begin(); i != m_renderables.end(); ++i)
{ {
callback(*(*i)); callback(*(*i));
} }