ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-12 23:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

make bool/qboolean/boolean *slightly* less wonky

Browse source
This commit is contained in:
Timothee 'TTimo' Besset 2012-05-27 20:17:32 -05:00
parent a6cd6796e1
commit a87fcf9899
7 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/bytebool.h
View file

@ -13,6 +13,7 @@ typedef bool qboolean;
#define qfalse false #define qfalse false
#else #else
typedef enum { qfalse, qtrue } qboolean; typedef enum { qfalse, qtrue } qboolean;
typedef qboolean bool; // some code uses bool directly ..
#endif #endif
typedef unsigned char byte; typedef unsigned char byte;

20
libs/cmdlib.h
View file

@ -38,6 +38,8 @@
#define PATH_MAX 260 #define PATH_MAX 260
#endif #endif
#include "bytebool.h"
// some easy portability crap // some easy portability crap
#ifdef _WIN32 #ifdef _WIN32
#include <direct.h> #include <direct.h>
@ -47,24 +49,6 @@
#define Q_mkdir( a,b ) mkdir( a,b ) #define Q_mkdir( a,b ) mkdir( a,b )
#endif #endif
#ifdef __cplusplus
typedef bool qboolean;
#endif
// NOTE TTimo: is this worth anything?
#ifndef __BYTEBOOL__
#define __BYTEBOOL__
#ifndef __cplusplus
typedef enum {false, true} boolean;
#else
typedef unsigned char boolean;
#endif
typedef unsigned char byte;
#endif // __BYTEBOOL__
void DefaultExtension( char *path, char *extension ); void DefaultExtension( char *path, char *extension );
void DefaultPath( char *path, char *basepath ); void DefaultPath( char *path, char *basepath );
void StripFilename( char *path ); void StripFilename( char *path );

4
libs/pakstuff.h
View file

@ -28,9 +28,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifndef __cplusplus #include "bytebool.h"
typedef int bool; // leo
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

2
radiant/brush.cpp
View file

@ -929,7 +929,7 @@ void Brush_Build( brush_t *b, bool bSnap, bool bMarkMap, bool bConvert, bool bFi
The incoming face is NOT left referenced. The incoming face is NOT left referenced.
============== ==============
*/ */
void Brush_SplitBrushByFace( brush_t *in, face_t *f, brush_t **front, brush_t **back, boolean bCaulk ){ void Brush_SplitBrushByFace( brush_t *in, face_t *f, brush_t **front, brush_t **back, qboolean bCaulk ){
brush_t *b; brush_t *b;
face_t *nf; face_t *nf;
vec3_t temp; vec3_t temp;

2
radiant/brush.h
View file

@ -47,7 +47,7 @@ void Brush_ResetFaceOriginals( brush_t *b );
face_t* Brush_Ray( vec3_t origin, vec3_t dir, brush_t *b, float *dist, int nFlags = 0 ); face_t* Brush_Ray( vec3_t origin, vec3_t dir, brush_t *b, float *dist, int nFlags = 0 );
void Brush_RemoveFromList( brush_t *b ); void Brush_RemoveFromList( brush_t *b );
// bCaulk means the faces created during the operation will be caulked, this is used in conjunction with g_PrefsDlg.m_bClipCaulk // bCaulk means the faces created during the operation will be caulked, this is used in conjunction with g_PrefsDlg.m_bClipCaulk
void Brush_SplitBrushByFace( brush_t *in, face_t *f, brush_t **front, brush_t **back, boolean bCaulk = false ); void Brush_SplitBrushByFace( brush_t *in, face_t *f, brush_t **front, brush_t **back, qboolean bCaulk = false );
void Brush_SelectFaceForDragging( brush_t *b, face_t *f, qboolean shear ); void Brush_SelectFaceForDragging( brush_t *b, face_t *f, qboolean shear );
void Brush_SetTexture( brush_t *b, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale = false, IPluginTexdef* pPlugTexdef = (IPluginTexdef*)NULL ); void Brush_SetTexture( brush_t *b, texdef_t *texdef, brushprimit_texdef_t *brushprimit_texdef, bool bFitScale = false, IPluginTexdef* pPlugTexdef = (IPluginTexdef*)NULL );
void Brush_SideSelect( brush_t *b, vec3_t origin, vec3_t dir, qboolean shear ); void Brush_SideSelect( brush_t *b, vec3_t origin, vec3_t dir, qboolean shear );

2
radiant/undo.cpp
View file

@ -610,7 +610,7 @@ void Undo_End( void ){
Undo_Undo Undo_Undo
============= =============
*/ */
void Undo_Undo( boolean bSilent ){ void Undo_Undo( qboolean bSilent ){
// spog - disable undo if undo levels = 0 // spog - disable undo if undo levels = 0
if ( g_PrefsDlg.m_nUndoLevels == 0 ) { if ( g_PrefsDlg.m_nUndoLevels == 0 ) {
Sys_Printf( "Undo_Undo: undo is disabled.\n" ); Sys_Printf( "Undo_Undo: undo is disabled.\n" );

2
radiant/undo.h
View file

@ -42,7 +42,7 @@ void Undo_AddEntity( entity_t *entity );
//end an entity after the operation is performed //end an entity after the operation is performed
void Undo_EndEntity( entity_t *entity ); void Undo_EndEntity( entity_t *entity );
//undo last operation (bSilent == true -> will not print the "undone blah blah message") //undo last operation (bSilent == true -> will not print the "undone blah blah message")
void Undo_Undo( boolean bSilent = false ); void Undo_Undo( qboolean bSilent = false );
//redo last undone operation //redo last undone operation
void Undo_Redo( void ); void Undo_Redo( void );
//get the undo Id of the next undo (0 if none available) //get the undo Id of the next undo (0 if none available)