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

integrated bobtoolz patch from LordHavoc

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@62 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-05-13 10:36:50 +00:00
parent 671a5e3259
commit 8649824a42
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -7,6 +7,7 @@ LordHavoc
- Removed static-linked libstdc++ hack for non-final builds. - Removed static-linked libstdc++ hack for non-final builds.
- Removed gcc explicit linking hack for non-final builds. - Removed gcc explicit linking hack for non-final builds.
- Added workaround for gcc static-member-pointer-as-template-argument bug. - Added workaround for gcc static-member-pointer-as-template-argument bug.
- Fixed bobtoolz linux compile errors.
30/04/2006 30/04/2006
SPoG SPoG

2
contrib/bobtoolz/DTreePlanter.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "string/string.h" #include "string/string.h"
#include "DEntity.h" #include "DEntity.h"
#include "scriptparser.h" #include "ScriptParser.h"
#include "mathlib.h" #include "mathlib.h"
#include "misc.h" #include "misc.h"

4
contrib/bobtoolz/bobToolz-GTK.cpp
View file

@ -127,7 +127,7 @@ const char* QERPlug_GetCommandTitleList()
#define NUM_TOOLBARBUTTONS 9 #define NUM_TOOLBARBUTTONS 9
unsigned int ToolbarButtonCount( void ) { std::size_t ToolbarButtonCount( void ) {
return NUM_TOOLBARBUTTONS; return NUM_TOOLBARBUTTONS;
} }
@ -209,7 +209,7 @@ public:
CBobtoolzToolbarButton g_bobtoolzToolbarButtons[NUM_TOOLBARBUTTONS]; CBobtoolzToolbarButton g_bobtoolzToolbarButtons[NUM_TOOLBARBUTTONS];
const IToolbarButton* GetToolbarButton(unsigned int index) const IToolbarButton* GetToolbarButton(std::size_t index)
{ {
g_bobtoolzToolbarButtons[index].mIndex = index; g_bobtoolzToolbarButtons[index].mIndex = index;
return &g_bobtoolzToolbarButtons[index]; return &g_bobtoolzToolbarButtons[index];

2
contrib/bobtoolz/funchandlers-GTK.cpp
View file

@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "DTrainDrawer.h" #include "DTrainDrawer.h"
#include "misc.h" #include "misc.h"
#include "scriptparser.h" #include "ScriptParser.h"
#include "DTreePlanter.h" #include "DTreePlanter.h"
#include "shapes.h" #include "shapes.h"

14
contrib/bobtoolz/misc.cpp
View file

@ -217,8 +217,6 @@ bool Q_Exec( const char *pCmd, bool bCreateConsole )
} }
#endif #endif
#include <windows.h>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
@ -239,7 +237,7 @@ bool Q_Exec( const char *pCmd, bool bCreateConsole )
for(; *pCmd == ' '; pCmd++); for(; *pCmd == ' '; pCmd++);
if(!CreateProcess(NULL, (char *)pCmd, NULL, NULL, FALSE, dwCreationFlags, NULL, NULL, &si, &pi)) if(!CreateProcess(NULL, (char *)pCmd, NULL, NULL, false, dwCreationFlags, NULL, NULL, &si, &pi))
return false; return false;
return true; return true;
@ -262,7 +260,7 @@ void StartBSP()
char command[1024]; char command[1024];
sprintf(command, "%s -nowater -fulldetail %s", exename, mapname); sprintf(command, "%s -nowater -fulldetail %s", exename, mapname);
Q_Exec( command, TRUE ); Q_Exec( command, true );
} }
class EntityWriteMiniPrt class EntityWriteMiniPrt
@ -281,8 +279,8 @@ public:
if(!strcmp(classname, "worldspawn")) if(!strcmp(classname, "worldspawn"))
{ {
world.LoadFromEntity(instance.path().top(), FALSE); world.LoadFromEntity(instance.path().top(), false);
world.RemoveNonCheckBrushes(exclusionList, TRUE); world.RemoveNonCheckBrushes(exclusionList, true);
world.SaveToFile(pFile); world.SaveToFile(pFile);
} }
else if(strstr(classname, "info_")) else if(strstr(classname, "info_"))
@ -379,12 +377,12 @@ bool GetEntityCentre(const char* entity, vec3_t centre)
{ {
const scene::Path* ent = FindEntityFromTargetname(entity); const scene::Path* ent = FindEntityFromTargetname(entity);
if(!ent) if(!ent)
return FALSE; return false;
scene::Instance& instance = *GlobalSceneGraph().find(*ent); scene::Instance& instance = *GlobalSceneGraph().find(*ent);
VectorCopy(instance.worldAABB().origin, centre); VectorCopy(instance.worldAABB().origin, centre);
return TRUE; return true;
} }
vec_t Min(vec_t a, vec_t b) vec_t Min(vec_t a, vec_t b)