id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-05-31 17:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced ( void ) with ()

Browse source
This commit is contained in:
Robert Beckebans 2014-08-02 14:48:04 +02:00
parent f6f02b7c71
commit 352df659a8
39 changed files with 187 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doomclassic/doom/doominterface.cpp
View file

@ -211,7 +211,7 @@ void DoomInterface::Shutdown() {
lastTicRun = 0; lastTicRun = 0;
} }
qboolean G_CheckDemoStatus( void ); qboolean G_CheckDemoStatus();
void DoomInterface::QuitCurrentGame() { void DoomInterface::QuitCurrentGame() {
for ( int i = 0; i < numplayers; i++ ) { for ( int i = 0; i < numplayers; i++ ) {

2
doomclassic/doom/doomlib.cpp
View file

@ -239,7 +239,7 @@ extern void D_RunFrame( bool );
extern void I_ShutdownSound(); extern void I_ShutdownSound();
extern void I_ShutdownMusic(); extern void I_ShutdownMusic();
extern void I_ShutdownGraphics(); extern void I_ShutdownGraphics();
extern void I_ProcessSoundEvents( void ); extern void I_ProcessSoundEvents();
void DoomLib::InitGlobals( void *ptr /* = NULL */ ) void DoomLib::InitGlobals( void *ptr /* = NULL */ )

30
doomclassic/doom/i_input.cpp
View file

@ -53,7 +53,7 @@ extern int PLAYERCOUNT;
#define NUM_BUTTONS 4 #define NUM_BUTTONS 4
static bool Cheat_God( void ) { static bool Cheat_God() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -72,7 +72,7 @@ static bool Cheat_God( void ) {
} }
#include "g_game.h" #include "g_game.h"
static bool Cheat_NextLevel( void ) { static bool Cheat_NextLevel() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -81,7 +81,7 @@ static bool Cheat_NextLevel( void ) {
return true; return true;
} }
static bool Cheat_GiveAll( void ) { static bool Cheat_GiveAll() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -103,7 +103,7 @@ static bool Cheat_GiveAll( void ) {
return true; return true;
} }
static bool Cheat_GiveAmmo( void ) { static bool Cheat_GiveAmmo() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -121,7 +121,7 @@ static bool Cheat_GiveAmmo( void ) {
return true; return true;
} }
static bool Cheat_Choppers( void ) { static bool Cheat_Choppers() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -143,7 +143,7 @@ static void TogglePowerUp( int i ) {
::g->plyr->message = STSTR_BEHOLDX; ::g->plyr->message = STSTR_BEHOLDX;
} }
static bool Cheat_GiveInvul( void ) { static bool Cheat_GiveInvul() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -152,7 +152,7 @@ static bool Cheat_GiveInvul( void ) {
return true; return true;
} }
static bool Cheat_GiveBerserk( void ) { static bool Cheat_GiveBerserk() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -161,7 +161,7 @@ static bool Cheat_GiveBerserk( void ) {
return true; return true;
} }
static bool Cheat_GiveBlur( void ) { static bool Cheat_GiveBlur() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -170,7 +170,7 @@ static bool Cheat_GiveBlur( void ) {
return true; return true;
} }
static bool Cheat_GiveRad( void ) { static bool Cheat_GiveRad() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -179,7 +179,7 @@ static bool Cheat_GiveRad( void ) {
return true; return true;
} }
static bool Cheat_GiveMap( void ) { static bool Cheat_GiveMap() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -188,7 +188,7 @@ static bool Cheat_GiveMap( void ) {
return true; return true;
} }
static bool Cheat_GiveLight( void ) { static bool Cheat_GiveLight() {
if( PLAYERCOUNT != 1 || ::g->netgame ) { if( PLAYERCOUNT != 1 || ::g->netgame ) {
return false; return false;
} }
@ -231,7 +231,7 @@ static cheatcode_t codes[] = {
const static int numberOfCodes = sizeof(codes) / sizeof(codes[0]); const static int numberOfCodes = sizeof(codes) / sizeof(codes[0]);
void BeginTrackingCheat( void ) { void BeginTrackingCheat() {
#if ALLOW_CHEATS #if ALLOW_CHEATS
tracking = true; tracking = true;
currentCheatLength = 0; currentCheatLength = 0;
@ -239,7 +239,7 @@ void BeginTrackingCheat( void ) {
#endif #endif
} }
void EndTrackingCheat( void ) { void EndTrackingCheat() {
#if ALLOW_CHEATS #if ALLOW_CHEATS
tracking = false; tracking = false;
#endif #endif
@ -282,7 +282,7 @@ void I_InitInput(void)
{ {
} }
void I_ShutdownInput( void ) void I_ShutdownInput()
{ {
} }
@ -463,7 +463,7 @@ int I_ReturnJoystickInputEvent( const int n, event_t* e) {
return 0; return 0;
} }
void I_EndJoystickInputEvents( void ) { void I_EndJoystickInputEvents() {
int i; int i;
for(i = 0; i < 18; i++) for(i = 0; i < 18; i++)
{ {

2
doomclassic/doom/i_net.h
View file

@ -43,7 +43,7 @@ void I_InitNetwork (void);
void I_NetCmd (void); void I_NetCmd (void);
// DHM - Nerve // DHM - Nerve
void I_ShutdownNetwork( void ); void I_ShutdownNetwork();
#endif #endif

2
doomclassic/doom/i_net_win32.cpp
View file

@ -260,7 +260,7 @@ void I_InitNetwork (void)
} }
// DHM - Nerve // DHM - Nerve
void I_ShutdownNetwork( void ) { void I_ShutdownNetwork() {
} }

6
doomclassic/doom/i_sound_win32.cpp
View file

@ -381,7 +381,7 @@ int I_StartSound2 ( int id, int player, mobj_t *origin, mobj_t *listener_origin,
I_ProcessSoundEvents I_ProcessSoundEvents
====================== ======================
*/ */
void I_ProcessSoundEvents( void ) { void I_ProcessSoundEvents() {
for( int i = 0; i < 128; i++ ) { for( int i = 0; i < 128; i++ ) {
if( soundEvents[i].pitch ) { if( soundEvents[i].pitch ) {
I_StartSound2( i, soundEvents[i].player, soundEvents[i].originator, soundEvents[i].listener, soundEvents[i].pitch, soundEvents[i].priority ); I_StartSound2( i, soundEvents[i].player, soundEvents[i].originator, soundEvents[i].listener, soundEvents[i].pitch, soundEvents[i].priority );
@ -490,7 +490,7 @@ I_UpdateSound
*/ */
// Update Listener Position and go through all the // Update Listener Position and go through all the
// channels and update speaker volumes for 3D sound. // channels and update speaker volumes for 3D sound.
void I_UpdateSound( void ) { void I_UpdateSound() {
if ( !soundHardwareInitialized ) { if ( !soundHardwareInitialized ) {
return; return;
} }
@ -989,7 +989,7 @@ void I_PlaySong( const char *songname, int looping)
I_UpdateMusic I_UpdateMusic
====================== ======================
*/ */
void I_UpdateMusic( void ) { void I_UpdateMusic() {
if ( !Music_initialized ) { if ( !Music_initialized ) {
return; return;
} }

6
doomclassic/doom/i_video.h
View file

@ -61,8 +61,8 @@ void I_EndRead (void);
void I_InitInput (void); void I_InitInput (void);
void I_ShutdownInput( void ) ; void I_ShutdownInput() ;
void I_InputFrame( void ); void I_InputFrame();
void I_UpdateControllerState(void); void I_UpdateControllerState(void);
struct controller_t; struct controller_t;
@ -70,7 +70,7 @@ int I_PollMouseInputEvents( controller_t * ) ;
int I_ReturnMouseInputEvent( const int n, event_t* e); int I_ReturnMouseInputEvent( const int n, event_t* e);
int I_PollJoystickInputEvents( controller_t * ) ; int I_PollJoystickInputEvents( controller_t * ) ;
int I_ReturnJoystickInputEvent( const int n, event_t* e); int I_ReturnJoystickInputEvent( const int n, event_t* e);
void I_EndJoystickInputEvents( void ); void I_EndJoystickInputEvents();
#endif #endif

2
doomclassic/doom/w_wad.cpp
View file

@ -308,7 +308,7 @@ void W_InitMultipleFiles (const char** filenames)
} }
void W_Shutdown( void ) { void W_Shutdown() {
/* /*
for (int i = 0 ; i < MAXWADFILES ; i++) { for (int i = 0 ; i < MAXWADFILES ; i++) {
if ( ::g->wadFileHandles[i] ) { if ( ::g->wadFileHandles[i] ) {

2
doomclassic/doom/w_wad.h
View file

@ -86,7 +86,7 @@ void W_ReadLump (int lump, void *dest);
void* W_CacheLumpNum (int lump, int tag); void* W_CacheLumpNum (int lump, int tag);
void* W_CacheLumpName (const char* name, int tag); void* W_CacheLumpName (const char* name, int tag);
void W_Shutdown( void ); void W_Shutdown();
#endif #endif

2
neo/d3xp/Item.h
View file

@ -236,7 +236,7 @@ public:
void Spawn(); void Spawn();
virtual bool Pickup( idPlayer* player ); virtual bool Pickup( idPlayer* player );
virtual bool ClientReceiveEvent( int event, int time, const idBitMsg& msg ); virtual bool ClientReceiveEvent( int event, int time, const idBitMsg& msg );
virtual void Think( void ); virtual void Think();
void Drop( bool death = false ); // was the drop caused by death of carrier? void Drop( bool death = false ); // was the drop caused by death of carrier?
void Return( idPlayer* player = NULL ); void Return( idPlayer* player = NULL );

2
neo/framework/Common.cpp
View file

@ -1684,7 +1684,7 @@ void idCommonLocal::BusyWait()
idCommonLocal::InitCommands idCommonLocal::InitCommands
=============== ===============
*/ */
void idCommonLocal::InitCommands( void ) void idCommonLocal::InitCommands()
{ {
// compilers // compilers
cmdSystem->AddCommand( "dmap", Dmap_f, CMD_FL_TOOL, "compiles a map", idCmdSystem::ArgCompletion_MapName ); cmdSystem->AddCommand( "dmap", Dmap_f, CMD_FL_TOOL, "compiles a map", idCmdSystem::ArgCompletion_MapName );

2
neo/framework/DeclSkin.cpp
View file

@ -154,7 +154,7 @@ const char* idDeclSkin::DefaultDefinition() const
idDeclSkin::GetNumModelAssociations idDeclSkin::GetNumModelAssociations
================ ================
*/ */
const int idDeclSkin::GetNumModelAssociations( void ) const const int idDeclSkin::GetNumModelAssociations() const
{ {
return associatedModels.Num(); return associatedModels.Num();
} }

2
neo/idlib/Base64.cpp
View file

@ -89,7 +89,7 @@ returns the minimum size in bytes of the target buffer for decoding
4 base64 digits <-> 3 bytes 4 base64 digits <-> 3 bytes
============ ============
*/ */
int idBase64::DecodeLength( void ) const int idBase64::DecodeLength() const
{ {
return 3 * len / 4; return 3 * len / 4;
} }

4
neo/idlib/Callback.h
View file

@ -158,7 +158,7 @@ private:
MakeCallback MakeCallback
======================== ========================
*/ */
ID_INLINE_EXTERN idCallbackStatic MakeCallback( void ( *f )( void ) ) ID_INLINE_EXTERN idCallbackStatic MakeCallback( void ( *f )() )
{ {
return idCallbackStatic( f ); return idCallbackStatic( f );
} }
@ -169,7 +169,7 @@ MakeCallback
======================== ========================
*/ */
template < class T > template < class T >
ID_INLINE_EXTERN idCallbackBindMem<T> MakeCallback( T* t, void ( T::*f )( void ) ) ID_INLINE_EXTERN idCallbackBindMem<T> MakeCallback( T* t, void ( T::*f )() )
{ {
return idCallbackBindMem<T>( t, f ); return idCallbackBindMem<T>( t, f );
} }

2
neo/idlib/containers/List.h
View file

@ -109,7 +109,7 @@ idListNewElement<type>
================ ================
*/ */
template< class type > template< class type >
ID_INLINE type* idListNewElement( void ) ID_INLINE type* idListNewElement()
{ {
return new type; return new type;
} }

4
neo/renderer/Cinematic.h
View file

@ -71,10 +71,10 @@ class idCinematic
{ {
public: public:
// initialize cinematic play back data // initialize cinematic play back data
static void InitCinematic( void ); static void InitCinematic();
// shutdown cinematic play back data // shutdown cinematic play back data
static void ShutdownCinematic( void ); static void ShutdownCinematic();
// allocates and returns a private subclass that implements the methods // allocates and returns a private subclass that implements the methods
// This should be used instead of new // This should be used instead of new

8
neo/renderer/Image_files.cpp
View file

@ -509,7 +509,7 @@ static void LoadJPG( const char* filename, unsigned char** pic, int* width, int*
/* Step 3: read file parameters with jpeg_read_header() */ /* Step 3: read file parameters with jpeg_read_header() */
( void ) jpeg_read_header( &cinfo, true ); jpeg_read_header( &cinfo, true );
/* We can ignore the return value from jpeg_read_header since /* We can ignore the return value from jpeg_read_header since
* (a) suspension is not possible with the stdio data source, and * (a) suspension is not possible with the stdio data source, and
* (b) we passed TRUE to reject a tables-only JPEG file as an error. * (b) we passed TRUE to reject a tables-only JPEG file as an error.
@ -524,7 +524,7 @@ static void LoadJPG( const char* filename, unsigned char** pic, int* width, int*
/* Step 5: Start decompressor */ /* Step 5: Start decompressor */
( void ) jpeg_start_decompress( &cinfo ); jpeg_start_decompress( &cinfo );
/* We can ignore the return value since suspension is not possible /* We can ignore the return value since suspension is not possible
* with the stdio data source. * with the stdio data source.
*/ */
@ -563,7 +563,7 @@ static void LoadJPG( const char* filename, unsigned char** pic, int* width, int*
*/ */
bbuf = ( ( out + ( row_stride * cinfo.output_scanline ) ) ); bbuf = ( ( out + ( row_stride * cinfo.output_scanline ) ) );
buffer = &bbuf; buffer = &bbuf;
( void ) jpeg_read_scanlines( &cinfo, buffer, 1 ); jpeg_read_scanlines( &cinfo, buffer, 1 );
} }
// clear all the alphas to 255 // clear all the alphas to 255
@ -582,7 +582,7 @@ static void LoadJPG( const char* filename, unsigned char** pic, int* width, int*
/* Step 7: Finish decompression */ /* Step 7: Finish decompression */
( void ) jpeg_finish_decompress( &cinfo ); jpeg_finish_decompress( &cinfo );
/* We can ignore the return value since suspension is not possible /* We can ignore the return value since suspension is not possible
* with the stdio data source. * with the stdio data source.
*/ */

3
neo/renderer/OpenGL/gl_Image.cpp
View file

@ -59,8 +59,7 @@ void idImage::SubImageUpload( int mipLevel, int x, int y, int z, int width, int
int padW = ( opts.width + 3 ) & ~3; int padW = ( opts.width + 3 ) & ~3;
int padH = ( opts.height + 3 ) & ~3; int padH = ( opts.height + 3 ) & ~3;
( void )padH;
( void )padW;
assert( x + width <= padW && y + height <= padH ); assert( x + width <= padW && y + height <= padH );
// upload the non-aligned value, OpenGL understands that there // upload the non-aligned value, OpenGL understands that there
// will be padding // will be padding

8
neo/tools/compilers/aas/AASBuild.cpp
View file

@ -44,7 +44,7 @@ If you have questions concerning this license or the applicable additional terms
idAASBuild::idAASBuild idAASBuild::idAASBuild
============ ============
*/ */
idAASBuild::idAASBuild( void ) idAASBuild::idAASBuild()
{ {
file = NULL; file = NULL;
procNodes = NULL; procNodes = NULL;
@ -60,7 +60,7 @@ idAASBuild::idAASBuild( void )
idAASBuild::~idAASBuild idAASBuild::~idAASBuild
============ ============
*/ */
idAASBuild::~idAASBuild( void ) idAASBuild::~idAASBuild()
{ {
Shutdown(); Shutdown();
} }
@ -70,7 +70,7 @@ idAASBuild::~idAASBuild( void )
idAASBuild::Shutdown idAASBuild::Shutdown
================ ================
*/ */
void idAASBuild::Shutdown( void ) void idAASBuild::Shutdown()
{ {
aasSettings = NULL; aasSettings = NULL;
if( file ) if( file )
@ -203,7 +203,7 @@ bool idAASBuild::LoadProcBSP( const char* name, ID_TIME_T minFileTime )
idAASBuild::DeleteProcBSP idAASBuild::DeleteProcBSP
============ ============
*/ */
void idAASBuild::DeleteProcBSP( void ) void idAASBuild::DeleteProcBSP()
{ {
if( procNodes ) if( procNodes )
{ {

4
neo/tools/compilers/aas/AASBuild_file.cpp
View file

@ -52,7 +52,7 @@ int aas_vertexShift;
idAASBuild::SetupHash idAASBuild::SetupHash
================ ================
*/ */
void idAASBuild::SetupHash( void ) void idAASBuild::SetupHash()
{ {
aas_vertexHash = new idHashIndex( VERTEX_HASH_SIZE, 1024 ); aas_vertexHash = new idHashIndex( VERTEX_HASH_SIZE, 1024 );
aas_edgeHash = new idHashIndex( EDGE_HASH_SIZE, 1024 ); aas_edgeHash = new idHashIndex( EDGE_HASH_SIZE, 1024 );
@ -63,7 +63,7 @@ void idAASBuild::SetupHash( void )
idAASBuild::ShutdownHash idAASBuild::ShutdownHash
================ ================
*/ */
void idAASBuild::ShutdownHash( void ) void idAASBuild::ShutdownHash()
{ {
delete aas_vertexHash; delete aas_vertexHash;
delete aas_edgeHash; delete aas_edgeHash;

2
neo/tools/compilers/aas/AASBuild_ledge.cpp
View file

@ -44,7 +44,7 @@ If you have questions concerning this license or the applicable additional terms
idLedge::idLedge idLedge::idLedge
============ ============
*/ */
idLedge::idLedge( void ) idLedge::idLedge()
{ {
} }

14
neo/tools/compilers/aas/AASBuild_local.h
View file

@ -64,7 +64,7 @@ public:
idPlane planes[8]; idPlane planes[8];
public: public:
idLedge( void ); idLedge();
idLedge( const idVec3& v1, const idVec3& v2, const idVec3& gravityDir, idBrushBSPNode* n ); idLedge( const idVec3& v1, const idVec3& v2, const idVec3& gravityDir, idBrushBSPNode* n );
void AddPoint( const idVec3& v ); void AddPoint( const idVec3& v );
void CreateBevels( const idVec3& gravityDir ); void CreateBevels( const idVec3& gravityDir );
@ -78,11 +78,11 @@ class idAASBuild
{ {
public: public:
idAASBuild( void ); idAASBuild();
~idAASBuild( void ); ~idAASBuild();
bool Build( const idStr& fileName, const idAASSettings* settings ); bool Build( const idStr& fileName, const idAASSettings* settings );
bool BuildReachability( const idStr& fileName, const idAASSettings* settings ); bool BuildReachability( const idStr& fileName, const idAASSettings* settings );
void Shutdown( void ); void Shutdown();
private: private:
const idAASSettings* aasSettings; const idAASSettings* aasSettings;
@ -98,7 +98,7 @@ private:
private: // map loading private: // map loading
void ParseProcNodes( idLexer* src ); void ParseProcNodes( idLexer* src );
bool LoadProcBSP( const char* name, ID_TIME_T minFileTime ); bool LoadProcBSP( const char* name, ID_TIME_T minFileTime );
void DeleteProcBSP( void ); void DeleteProcBSP();
bool ChoppedAwayByProcBSP( int nodeNum, idFixedWinding* w, const idVec3& normal, const idVec3& origin, const float radius ); bool ChoppedAwayByProcBSP( int nodeNum, idFixedWinding* w, const idVec3& normal, const idVec3& origin, const float radius );
void ClipBrushSidesWithProcBSP( idBrushList& brushList ); void ClipBrushSidesWithProcBSP( idBrushList& brushList );
int ContentsForAAS( int contents ); int ContentsForAAS( int contents );
@ -134,8 +134,8 @@ private: // merging
void MergeLeafNodes( idBrushBSP& bsp ); void MergeLeafNodes( idBrushBSP& bsp );
private: // storing file private: // storing file
void SetupHash( void ); void SetupHash();
void ShutdownHash( void ); void ShutdownHash();
void ClearHash( const idBounds& bounds ); void ClearHash( const idBounds& bounds );
int HashVec( const idVec3& vec ); int HashVec( const idVec3& vec );
bool GetVertex( const idVec3& v, int* vertexNum ); bool GetVertex( const idVec3& v, int* vertexNum );

10
neo/tools/compilers/aas/AASCluster.cpp
View file

@ -187,7 +187,7 @@ bool idAASCluster::FloodClusterAreas_r( int areaNum, int clusterNum )
idAASCluster::RemoveAreaClusterNumbers idAASCluster::RemoveAreaClusterNumbers
================ ================
*/ */
void idAASCluster::RemoveAreaClusterNumbers( void ) void idAASCluster::RemoveAreaClusterNumbers()
{ {
int i; int i;
@ -296,7 +296,7 @@ void idAASCluster::NumberClusterAreas( int clusterNum )
idAASCluster::FindClusters idAASCluster::FindClusters
================ ================
*/ */
bool idAASCluster::FindClusters( void ) bool idAASCluster::FindClusters()
{ {
int i, clusterNum; int i, clusterNum;
aasCluster_t cluster; aasCluster_t cluster;
@ -350,7 +350,7 @@ bool idAASCluster::FindClusters( void )
idAASCluster::CreatePortals idAASCluster::CreatePortals
================ ================
*/ */
void idAASCluster::CreatePortals( void ) void idAASCluster::CreatePortals()
{ {
int i; int i;
aasPortal_t portal; aasPortal_t portal;
@ -373,7 +373,7 @@ void idAASCluster::CreatePortals( void )
idAASCluster::TestPortals idAASCluster::TestPortals
================ ================
*/ */
bool idAASCluster::TestPortals( void ) bool idAASCluster::TestPortals()
{ {
int i; int i;
aasPortal_t* portal, *portal2; aasPortal_t* portal, *portal2;
@ -480,7 +480,7 @@ bool idAASCluster::TestPortals( void )
idAASCluster::RemoveInvalidPortals idAASCluster::RemoveInvalidPortals
================ ================
*/ */
void idAASCluster::RemoveInvalidPortals( void ) void idAASCluster::RemoveInvalidPortals()
{ {
int i, j, k, face1Num, face2Num, otherAreaNum, numOpenAreas, numInvalidPortals; int i, j, k, face1Num, face2Num, otherAreaNum, numOpenAreas, numInvalidPortals;
aasFace_t* face1, *face2; aasFace_t* face1, *face2;

12
neo/tools/compilers/aas/AASCluster.h
View file

@ -51,13 +51,13 @@ private:
private: private:
bool UpdatePortal( int areaNum, int clusterNum ); bool UpdatePortal( int areaNum, int clusterNum );
bool FloodClusterAreas_r( int areaNum, int clusterNum ); bool FloodClusterAreas_r( int areaNum, int clusterNum );
void RemoveAreaClusterNumbers( void ); void RemoveAreaClusterNumbers();
void NumberClusterAreas( int clusterNum ); void NumberClusterAreas( int clusterNum );
bool FindClusters( void ); bool FindClusters();
void CreatePortals( void ); void CreatePortals();
bool TestPortals( void ); bool TestPortals();
void ReportEfficiency( void ); void ReportEfficiency();
void RemoveInvalidPortals( void ); void RemoveInvalidPortals();
}; };
#endif /* !__AASCLUSTER_H__ */ #endif /* !__AASCLUSTER_H__ */

32
neo/tools/compilers/aas/Brush.cpp
View file

@ -74,7 +74,7 @@ void DisplayRealTimeString( char* string, ... )
idBrushSide::idBrushSide idBrushSide::idBrushSide
============ ============
*/ */
idBrushSide::idBrushSide( void ) idBrushSide::idBrushSide()
{ {
flags = 0; flags = 0;
planeNum = -1; planeNum = -1;
@ -99,7 +99,7 @@ idBrushSide::idBrushSide( const idPlane& plane, int planeNum )
idBrushSide::~idBrushSide idBrushSide::~idBrushSide
============ ============
*/ */
idBrushSide::~idBrushSide( void ) idBrushSide::~idBrushSide()
{ {
if( winding ) if( winding )
{ {
@ -112,7 +112,7 @@ idBrushSide::~idBrushSide( void )
idBrushSide::Copy idBrushSide::Copy
============ ============
*/ */
idBrushSide* idBrushSide::Copy( void ) const idBrushSide* idBrushSide::Copy() const
{ {
idBrushSide* side; idBrushSide* side;
@ -184,7 +184,7 @@ int idBrushSide::Split( const idPlane& splitPlane, idBrushSide** front, idBrushS
idBrush::idBrush idBrush::idBrush
============ ============
*/ */
idBrush::idBrush( void ) idBrush::idBrush()
{ {
contents = flags = 0; contents = flags = 0;
bounds.Clear(); bounds.Clear();
@ -198,7 +198,7 @@ idBrush::idBrush( void )
idBrush::~idBrush idBrush::~idBrush
============ ============
*/ */
idBrush::~idBrush( void ) idBrush::~idBrush()
{ {
for( int i = 0; i < sides.Num(); i++ ) for( int i = 0; i < sides.Num(); i++ )
{ {
@ -211,7 +211,7 @@ idBrush::~idBrush( void )
idBrush::RemoveSidesWithoutWinding idBrush::RemoveSidesWithoutWinding
============ ============
*/ */
bool idBrush::RemoveSidesWithoutWinding( void ) bool idBrush::RemoveSidesWithoutWinding()
{ {
int i; int i;
@ -235,7 +235,7 @@ bool idBrush::RemoveSidesWithoutWinding( void )
idBrush::CreateWindings idBrush::CreateWindings
============ ============
*/ */
bool idBrush::CreateWindings( void ) bool idBrush::CreateWindings()
{ {
int i, j; int i, j;
idBrushSide* side; idBrushSide* side;
@ -489,7 +489,7 @@ void idBrush::Transform( const idVec3& origin, const idMat3& axis )
idBrush::GetVolume idBrush::GetVolume
============ ============
*/ */
float idBrush::GetVolume( void ) const float idBrush::GetVolume() const
{ {
int i; int i;
idWinding* w; idWinding* w;
@ -942,7 +942,7 @@ idBrush::AddBevelsForAxialBox
*/ */
#define BRUSH_BEVEL_EPSILON 0.1f #define BRUSH_BEVEL_EPSILON 0.1f
void idBrush::AddBevelsForAxialBox( void ) void idBrush::AddBevelsForAxialBox()
{ {
int axis, dir, i, j, k, l, order; int axis, dir, i, j, k, l, order;
idBrushSide* side, *newSide; idBrushSide* side, *newSide;
@ -1158,7 +1158,7 @@ void idBrush::ExpandForAxialBox( const idBounds& bounds )
idBrush::Copy idBrush::Copy
============ ============
*/ */
idBrush* idBrush::Copy( void ) const idBrush* idBrush::Copy() const
{ {
int i; int i;
idBrush* b; idBrush* b;
@ -1188,7 +1188,7 @@ idBrush* idBrush::Copy( void ) const
idBrushList::idBrushList idBrushList::idBrushList
============ ============
*/ */
idBrushList::idBrushList( void ) idBrushList::idBrushList()
{ {
numBrushes = numBrushSides = 0; numBrushes = numBrushSides = 0;
head = tail = NULL; head = tail = NULL;
@ -1199,7 +1199,7 @@ idBrushList::idBrushList( void )
idBrushList::~idBrushList idBrushList::~idBrushList
============ ============
*/ */
idBrushList::~idBrushList( void ) idBrushList::~idBrushList()
{ {
} }
@ -1208,7 +1208,7 @@ idBrushList::~idBrushList( void )
idBrushList::GetBounds idBrushList::GetBounds
============ ============
*/ */
idBounds idBrushList::GetBounds( void ) const idBounds idBrushList::GetBounds() const
{ {
idBounds bounds; idBounds bounds;
idBrush* b; idBrush* b;
@ -1387,7 +1387,7 @@ void idBrushList::Delete( idBrush* brush )
idBrushList::Copy idBrushList::Copy
============ ============
*/ */
idBrushList* idBrushList::Copy( void ) const idBrushList* idBrushList::Copy() const
{ {
idBrush* brush; idBrush* brush;
idBrushList* list; idBrushList* list;
@ -1406,7 +1406,7 @@ idBrushList* idBrushList::Copy( void ) const
idBrushList::Free idBrushList::Free
============ ============
*/ */
void idBrushList::Free( void ) void idBrushList::Free()
{ {
idBrush* brush, *next; idBrush* brush, *next;
@ -1787,7 +1787,7 @@ idBrushMap::idBrushMap( const idStr& fileName, const idStr& ext )
idBrushMap::~idBrushMap idBrushMap::~idBrushMap
============ ============
*/ */
idBrushMap::~idBrushMap( void ) idBrushMap::~idBrushMap()
{ {
if( !fp ) if( !fp )
{ {

66
neo/tools/compilers/aas/Brush.h
View file

@ -66,11 +66,11 @@ class idBrushSide
friend class idBrush; friend class idBrush;
public: public:
idBrushSide( void ); idBrushSide();
idBrushSide( const idPlane& plane, int planeNum ); idBrushSide( const idPlane& plane, int planeNum );
~idBrushSide( void ); ~idBrushSide();
int GetFlags( void ) const int GetFlags() const
{ {
return flags; return flags;
} }
@ -82,7 +82,7 @@ public:
{ {
flags &= ~flag; flags &= ~flag;
} }
const idPlane& GetPlane( void ) const const idPlane& GetPlane() const
{ {
return plane; return plane;
} }
@ -90,15 +90,15 @@ public:
{ {
planeNum = num; planeNum = num;
} }
int GetPlaneNum( void ) int GetPlaneNum()
{ {
return planeNum; return planeNum;
} }
const idWinding* GetWinding( void ) const const idWinding* GetWinding() const
{ {
return winding; return winding;
} }
idBrushSide* Copy( void ) const; idBrushSide* Copy() const;
int Split( const idPlane& splitPlane, idBrushSide** front, idBrushSide** back ) const; int Split( const idPlane& splitPlane, idBrushSide** front, idBrushSide** back ) const;
private: private:
@ -123,10 +123,10 @@ class idBrush
friend class idBrushList; friend class idBrushList;
public: public:
idBrush( void ); idBrush();
~idBrush( void ); ~idBrush();
int GetFlags( void ) const int GetFlags() const
{ {
return flags; return flags;
} }
@ -150,16 +150,16 @@ public:
{ {
this->contents = contents; this->contents = contents;
} }
int GetContents( void ) const int GetContents() const
{ {
return contents; return contents;
} }
const idBounds& GetBounds( void ) const const idBounds& GetBounds() const
{ {
return bounds; return bounds;
} }
float GetVolume( void ) const; float GetVolume() const;
int GetNumSides( void ) const int GetNumSides() const
{ {
return sides.Num(); return sides.Num();
} }
@ -171,11 +171,11 @@ public:
{ {
planeSide = s; planeSide = s;
} }
void SavePlaneSide( void ) void SavePlaneSide()
{ {
savedPlaneSide = planeSide; savedPlaneSide = planeSide;
} }
int GetSavedPlaneSide( void ) const int GetSavedPlaneSide() const
{ {
return savedPlaneSide; return savedPlaneSide;
} }
@ -183,7 +183,7 @@ public:
bool FromWinding( const idWinding& w, const idPlane& windingPlane ); bool FromWinding( const idWinding& w, const idPlane& windingPlane );
bool FromBounds( const idBounds& bounds ); bool FromBounds( const idBounds& bounds );
void Transform( const idVec3& origin, const idMat3& axis ); void Transform( const idVec3& origin, const idMat3& axis );
idBrush* Copy( void ) const; idBrush* Copy() const;
bool TryMerge( const idBrush* brush, const idPlaneSet& planeList ); bool TryMerge( const idBrush* brush, const idPlaneSet& planeList );
// returns true if the brushes did intersect // returns true if the brushes did intersect
bool Subtract( const idBrush* b, idBrushList& list ) const; bool Subtract( const idBrush* b, idBrushList& list ) const;
@ -192,7 +192,7 @@ public:
// expand the brush for an axial bounding box // expand the brush for an axial bounding box
void ExpandForAxialBox( const idBounds& bounds ); void ExpandForAxialBox( const idBounds& bounds );
// next brush in list // next brush in list
idBrush* Next( void ) const idBrush* Next() const
{ {
return next; return next;
} }
@ -210,10 +210,10 @@ private:
idList<idBrushSide*> sides; // list with sides idList<idBrushSide*> sides; // list with sides
private: private:
bool CreateWindings( void ); bool CreateWindings();
void BoundBrush( const idBrush* original = NULL ); void BoundBrush( const idBrush* original = NULL );
void AddBevelsForAxialBox( void ); void AddBevelsForAxialBox();
bool RemoveSidesWithoutWinding( void ); bool RemoveSidesWithoutWinding();
}; };
@ -226,35 +226,35 @@ private:
class idBrushList class idBrushList
{ {
public: public:
idBrushList( void ); idBrushList();
~idBrushList( void ); ~idBrushList();
int Num( void ) const int Num() const
{ {
return numBrushes; return numBrushes;
} }
int NumSides( void ) const int NumSides() const
{ {
return numBrushSides; return numBrushSides;
} }
idBrush* Head( void ) const idBrush* Head() const
{ {
return head; return head;
} }
idBrush* Tail( void ) const idBrush* Tail() const
{ {
return tail; return tail;
} }
void Clear( void ) void Clear()
{ {
head = tail = NULL; head = tail = NULL;
numBrushes = 0; numBrushes = 0;
} }
bool IsEmpty( void ) const bool IsEmpty() const
{ {
return ( numBrushes == 0 ); return ( numBrushes == 0 );
} }
idBounds GetBounds( void ) const; idBounds GetBounds() const;
// add brush to the tail of the list // add brush to the tail of the list
void AddToTail( idBrush* brush ); void AddToTail( idBrush* brush );
// add list to the tail of the list // add list to the tail of the list
@ -268,9 +268,9 @@ public:
// remove the brush from the list and delete the brush // remove the brush from the list and delete the brush
void Delete( idBrush* brush ); void Delete( idBrush* brush );
// returns a copy of the brush list // returns a copy of the brush list
idBrushList* Copy( void ) const; idBrushList* Copy() const;
// delete all brushes in the list // delete all brushes in the list
void Free( void ); void Free();
// split the brushes in the list into two lists // split the brushes in the list into two lists
void Split( const idPlane& plane, int planeNum, idBrushList& frontList, idBrushList& backList, bool useBrushSavedPlaneSide = false ); void Split( const idPlane& plane, int planeNum, idBrushList& frontList, idBrushList& backList, bool useBrushSavedPlaneSide = false );
// chop away all brush overlap // chop away all brush overlap
@ -303,7 +303,7 @@ class idBrushMap
public: public:
idBrushMap( const idStr& fileName, const idStr& ext ); idBrushMap( const idStr& fileName, const idStr& ext );
~idBrushMap( void ); ~idBrushMap();
void SetTexture( const idStr& textureName ) void SetTexture( const idStr& textureName )
{ {
texture = textureName; texture = textureName;

26
neo/tools/compilers/aas/BrushBSP.cpp
View file

@ -55,7 +55,7 @@ If you have questions concerning this license or the applicable additional terms
idBrushBSPPortal::idBrushBSPPortal idBrushBSPPortal::idBrushBSPPortal
============ ============
*/ */
idBrushBSPPortal::idBrushBSPPortal( void ) idBrushBSPPortal::idBrushBSPPortal()
{ {
planeNum = -1; planeNum = -1;
winding = NULL; winding = NULL;
@ -70,7 +70,7 @@ idBrushBSPPortal::idBrushBSPPortal( void )
idBrushBSPPortal::~idBrushBSPPortal idBrushBSPPortal::~idBrushBSPPortal
============ ============
*/ */
idBrushBSPPortal::~idBrushBSPPortal( void ) idBrushBSPPortal::~idBrushBSPPortal()
{ {
if( winding ) if( winding )
{ {
@ -160,7 +160,7 @@ void idBrushBSPPortal::RemoveFromNode( idBrushBSPNode* l )
idBrushBSPPortal::Flip idBrushBSPPortal::Flip
============ ============
*/ */
void idBrushBSPPortal::Flip( void ) void idBrushBSPPortal::Flip()
{ {
idBrushBSPNode* frontNode, *backNode; idBrushBSPNode* frontNode, *backNode;
@ -236,7 +236,7 @@ int idBrushBSPPortal::Split( const idPlane& splitPlane, idBrushBSPPortal** front
idBrushBSPNode::idBrushBSPNode idBrushBSPNode::idBrushBSPNode
============ ============
*/ */
idBrushBSPNode::idBrushBSPNode( void ) idBrushBSPNode::idBrushBSPNode()
{ {
brushList.Clear(); brushList.Clear();
contents = 0; contents = 0;
@ -253,7 +253,7 @@ idBrushBSPNode::idBrushBSPNode( void )
idBrushBSPNode::~idBrushBSPNode idBrushBSPNode::~idBrushBSPNode
============ ============
*/ */
idBrushBSPNode::~idBrushBSPNode( void ) idBrushBSPNode::~idBrushBSPNode()
{ {
idBrushBSPPortal* p; idBrushBSPPortal* p;
@ -282,7 +282,7 @@ idBrushBSPNode::~idBrushBSPNode( void )
idBrushBSPNode::SetContentsFromBrushes idBrushBSPNode::SetContentsFromBrushes
============ ============
*/ */
void idBrushBSPNode::SetContentsFromBrushes( void ) void idBrushBSPNode::SetContentsFromBrushes()
{ {
idBrush* brush; idBrush* brush;
@ -298,7 +298,7 @@ void idBrushBSPNode::SetContentsFromBrushes( void )
idBrushBSPNode::GetPortalBounds idBrushBSPNode::GetPortalBounds
============ ============
*/ */
idBounds idBrushBSPNode::GetPortalBounds( void ) idBounds idBrushBSPNode::GetPortalBounds()
{ {
int s, i; int s, i;
idBrushBSPPortal* p; idBrushBSPPortal* p;
@ -322,7 +322,7 @@ idBounds idBrushBSPNode::GetPortalBounds( void )
idBrushBSPNode::TestLeafNode idBrushBSPNode::TestLeafNode
============ ============
*/ */
bool idBrushBSPNode::TestLeafNode( void ) bool idBrushBSPNode::TestLeafNode()
{ {
int s, n; int s, n;
float d; float d;
@ -567,7 +567,7 @@ void idBrushBSPNode::RemoveFlagRecurseFlood( int flag )
idBrushBSP::idBrushBSP idBrushBSP::idBrushBSP
============ ============
*/ */
idBrushBSP::idBrushBSP( void ) idBrushBSP::idBrushBSP()
{ {
root = outside = NULL; root = outside = NULL;
numSplits = numPrunedSplits = 0; numSplits = numPrunedSplits = 0;
@ -580,7 +580,7 @@ idBrushBSP::idBrushBSP( void )
idBrushBSP::~idBrushBSP idBrushBSP::~idBrushBSP
============ ============
*/ */
idBrushBSP::~idBrushBSP( void ) idBrushBSP::~idBrushBSP()
{ {
RemoveMultipleLeafNodeReferences_r( root ); RemoveMultipleLeafNodeReferences_r( root );
@ -1468,7 +1468,7 @@ void idBrushBSP::MakeTreePortals_r( idBrushBSPNode* node )
idBrushBSP::MakeOutsidePortals idBrushBSP::MakeOutsidePortals
============ ============
*/ */
void idBrushBSP::MakeOutsidePortals( void ) void idBrushBSP::MakeOutsidePortals()
{ {
int i, j, n; int i, j, n;
idBounds bounds; idBounds bounds;
@ -1531,7 +1531,7 @@ void idBrushBSP::MakeOutsidePortals( void )
idBrushBSP::Portalize idBrushBSP::Portalize
============ ============
*/ */
void idBrushBSP::Portalize( void ) void idBrushBSP::Portalize()
{ {
common->Printf( "[Portalize BSP]\n" ); common->Printf( "[Portalize BSP]\n" );
common->Printf( "%6d nodes\n", ( numSplits - numPrunedSplits ) * 2 + 1 ); common->Printf( "%6d nodes\n", ( numSplits - numPrunedSplits ) * 2 + 1 );
@ -1871,7 +1871,7 @@ idBrushBSP::SetPortalPlanes
give all portals a plane number give all portals a plane number
============ ============
*/ */
void idBrushBSP::SetPortalPlanes( void ) void idBrushBSP::SetPortalPlanes()
{ {
SetPortalPlanes_r( root, portalPlanes ); SetPortalPlanes_r( root, portalPlanes );
} }

52
neo/tools/compilers/aas/BrushBSP.h
View file

@ -55,17 +55,17 @@ class idBrushBSPPortal
friend class idBrushBSPNode; friend class idBrushBSPNode;
public: public:
idBrushBSPPortal( void ); idBrushBSPPortal();
~idBrushBSPPortal( void ); ~idBrushBSPPortal();
void AddToNodes( idBrushBSPNode* front, idBrushBSPNode* back ); void AddToNodes( idBrushBSPNode* front, idBrushBSPNode* back );
void RemoveFromNode( idBrushBSPNode* l ); void RemoveFromNode( idBrushBSPNode* l );
void Flip( void ); void Flip();
int Split( const idPlane& splitPlane, idBrushBSPPortal** front, idBrushBSPPortal** back ); int Split( const idPlane& splitPlane, idBrushBSPPortal** front, idBrushBSPPortal** back );
idWinding* GetWinding( void ) const idWinding* GetWinding() const
{ {
return winding; return winding;
} }
const idPlane& GetPlane( void ) const const idPlane& GetPlane() const
{ {
return plane; return plane;
} }
@ -73,11 +73,11 @@ public:
{ {
faceNum = num; faceNum = num;
} }
int GetFaceNum( void ) const int GetFaceNum() const
{ {
return faceNum; return faceNum;
} }
int GetFlags( void ) const int GetFlags() const
{ {
return flags; return flags;
} }
@ -125,15 +125,15 @@ class idBrushBSPNode
friend class idBrushBSPPortal; friend class idBrushBSPPortal;
public: public:
idBrushBSPNode( void ); idBrushBSPNode();
~idBrushBSPNode( void ); ~idBrushBSPNode();
void SetContentsFromBrushes( void ); void SetContentsFromBrushes();
idBounds GetPortalBounds( void ); idBounds GetPortalBounds();
idBrushBSPNode* GetChild( int index ) const idBrushBSPNode* GetChild( int index ) const
{ {
return children[index]; return children[index];
} }
idBrushBSPNode* GetParent( void ) const idBrushBSPNode* GetParent() const
{ {
return parent; return parent;
} }
@ -141,15 +141,15 @@ public:
{ {
this->contents = contents; this->contents = contents;
} }
int GetContents( void ) const int GetContents() const
{ {
return contents; return contents;
} }
const idPlane& GetPlane( void ) const const idPlane& GetPlane() const
{ {
return plane; return plane;
} }
idBrushBSPPortal* GetPortals( void ) const idBrushBSPPortal* GetPortals() const
{ {
return portals; return portals;
} }
@ -157,11 +157,11 @@ public:
{ {
areaNum = num; areaNum = num;
} }
int GetAreaNum( void ) const int GetAreaNum() const
{ {
return areaNum; return areaNum;
} }
int GetFlags( void ) const int GetFlags() const
{ {
return flags; return flags;
} }
@ -173,7 +173,7 @@ public:
{ {
flags &= ~flag; flags &= ~flag;
} }
bool TestLeafNode( void ); bool TestLeafNode();
// remove the flag from nodes found by flooding through portals to nodes with the flag set // remove the flag from nodes found by flooding through portals to nodes with the flag set
void RemoveFlagFlood( int flag ); void RemoveFlagFlood( int flag );
// recurse down the tree and remove the flag from all visited nodes // recurse down the tree and remove the flag from all visited nodes
@ -210,8 +210,8 @@ class idBrushBSP
{ {
public: public:
idBrushBSP( void ); idBrushBSP();
~idBrushBSP( void ); ~idBrushBSP();
// build a bsp tree from a set of brushes // build a bsp tree from a set of brushes
void Build( idBrushList brushList, int skipContents, void Build( idBrushList brushList, int skipContents,
bool ( *ChopAllowed )( idBrush* b1, idBrush* b2 ), bool ( *ChopAllowed )( idBrush* b1, idBrush* b2 ),
@ -219,7 +219,7 @@ public:
// remove splits in subspaces with the given contents // remove splits in subspaces with the given contents
void PruneTree( int contents ); void PruneTree( int contents );
// portalize the bsp tree // portalize the bsp tree
void Portalize( void ); void Portalize();
// remove subspaces outside the map not reachable by entities // remove subspaces outside the map not reachable by entities
bool RemoveOutside( const idMapFile* mapFile, int contents, const idStrList& classNames ); bool RemoveOutside( const idMapFile* mapFile, int contents, const idStrList& classNames );
// write file with a trace going through a leak // write file with a trace going through a leak
@ -234,12 +234,12 @@ public:
// write a map file with a brush for every leaf node that has the given contents // write a map file with a brush for every leaf node that has the given contents
void WriteBrushMap( const idStr& fileName, const idStr& ext, int contents ); void WriteBrushMap( const idStr& fileName, const idStr& ext, int contents );
// bounds for the whole tree // bounds for the whole tree
const idBounds& GetTreeBounds( void ) const const idBounds& GetTreeBounds() const
{ {
return treeBounds; return treeBounds;
} }
// root node of the tree // root node of the tree
idBrushBSPNode* GetRootNode( void ) const idBrushBSPNode* GetRootNode() const
{ {
return root; return root;
} }
@ -269,7 +269,7 @@ private:
private: private:
void RemoveMultipleLeafNodeReferences_r( idBrushBSPNode* node ); void RemoveMultipleLeafNodeReferences_r( idBrushBSPNode* node );
void Free_r( idBrushBSPNode* node ); void Free_r( idBrushBSPNode* node );
void IncreaseNumSplits( void ); void IncreaseNumSplits();
bool IsValidSplitter( const idBrushSide* side ); bool IsValidSplitter( const idBrushSide* side );
int BrushSplitterStats( const idBrush* brush, int planeNum, const idPlaneSet& planeList, bool* testedPlanes, struct splitterStats_s& stats ); int BrushSplitterStats( const idBrush* brush, int planeNum, const idPlaneSet& planeList, bool* testedPlanes, struct splitterStats_s& stats );
int FindSplitter( idBrushBSPNode* node, const idPlaneSet& planeList, bool* testedPlanes, struct splitterStats_s& bestStats ); int FindSplitter( idBrushBSPNode* node, const idPlaneSet& planeList, bool* testedPlanes, struct splitterStats_s& bestStats );
@ -278,7 +278,7 @@ private:
idBrushBSPNode* ProcessGridCell( idBrushBSPNode* node, int skipContents ); idBrushBSPNode* ProcessGridCell( idBrushBSPNode* node, int skipContents );
void BuildGrid_r( idList<idBrushBSPNode*>& gridCells, idBrushBSPNode* node ); void BuildGrid_r( idList<idBrushBSPNode*>& gridCells, idBrushBSPNode* node );
void PruneTree_r( idBrushBSPNode* node, int contents ); void PruneTree_r( idBrushBSPNode* node, int contents );
void MakeOutsidePortals( void ); void MakeOutsidePortals();
idWinding* BaseWindingForNode( idBrushBSPNode* node ); idWinding* BaseWindingForNode( idBrushBSPNode* node );
void MakeNodePortal( idBrushBSPNode* node ); void MakeNodePortal( idBrushBSPNode* node );
void SplitNodePortals( idBrushBSPNode* node ); void SplitNodePortals( idBrushBSPNode* node );
@ -288,7 +288,7 @@ private:
bool FloodFromEntities( const idMapFile* mapFile, int contents, const idStrList& classNames ); bool FloodFromEntities( const idMapFile* mapFile, int contents, const idStrList& classNames );
void RemoveOutside_r( idBrushBSPNode* node, int contents ); void RemoveOutside_r( idBrushBSPNode* node, int contents );
void SetPortalPlanes_r( idBrushBSPNode* node, idPlaneSet& planeList ); void SetPortalPlanes_r( idBrushBSPNode* node, idPlaneSet& planeList );
void SetPortalPlanes( void ); void SetPortalPlanes();
void MergePortals_r( idBrushBSPNode* node, int skipContents ); void MergePortals_r( idBrushBSPNode* node, int skipContents );
void MergeLeafNodePortals( idBrushBSPNode* node, int skipContents ); void MergeLeafNodePortals( idBrushBSPNode* node, int skipContents );
void UpdateTreeAfterMerge_r( idBrushBSPNode* node, const idBounds& bounds, idBrushBSPNode* oldNode, idBrushBSPNode* newNode ); void UpdateTreeAfterMerge_r( idBrushBSPNode* node, const idBounds& bounds, idBrushBSPNode* oldNode, idBrushBSPNode* newNode );

6
neo/tools/compilers/dmap/dmap.cpp
View file

@ -116,7 +116,7 @@ bool ProcessModel( uEntity_t* e, bool floodFill )
ProcessModels ProcessModels
============ ============
*/ */
bool ProcessModels( void ) bool ProcessModels()
{ {
bool oldVerbose; bool oldVerbose;
uEntity_t* entity; uEntity_t* entity;
@ -158,7 +158,7 @@ bool ProcessModels( void )
DmapHelp DmapHelp
============ ============
*/ */
void DmapHelp( void ) void DmapHelp()
{ {
common->Printf( common->Printf(
@ -176,7 +176,7 @@ void DmapHelp( void )
ResetDmapGlobals ResetDmapGlobals
============ ============
*/ */
void ResetDmapGlobals( void ) void ResetDmapGlobals()
{ {
dmapGlobals.mapFileBase[0] = '\0'; dmapGlobals.mapFileBase[0] = '\0';
dmapGlobals.dmapFile = NULL; dmapGlobals.dmapFile = NULL;

18
neo/tools/compilers/dmap/dmap.h
View file

@ -320,7 +320,7 @@ void WriteBspBrushMap( const char* name, uBrush_t* list );
void FilterBrushesIntoTree( uEntity_t* e ); void FilterBrushesIntoTree( uEntity_t* e );
void SplitBrush( uBrush_t* brush, int planenum, uBrush_t** front, uBrush_t** back ); void SplitBrush( uBrush_t* brush, int planenum, uBrush_t** front, uBrush_t** back );
node_t* AllocNode( void ); node_t* AllocNode();
//============================================================================= //=============================================================================
@ -329,22 +329,22 @@ node_t* AllocNode( void );
bool LoadDMapFile( const char* filename ); bool LoadDMapFile( const char* filename );
void FreeOptimizeGroupList( optimizeGroup_t* groups ); void FreeOptimizeGroupList( optimizeGroup_t* groups );
void FreeDMapFile( void ); void FreeDMapFile();
//============================================================================= //=============================================================================
// draw.cpp -- draw debug views either directly, or through glserv.exe // draw.cpp -- draw debug views either directly, or through glserv.exe
void Draw_ClearWindow( void ); void Draw_ClearWindow();
void DrawWinding( const idWinding* w ); void DrawWinding( const idWinding* w );
void DrawAuxWinding( const idWinding* w ); void DrawAuxWinding( const idWinding* w );
void DrawLine( idVec3 v1, idVec3 v2, int color ); void DrawLine( idVec3 v1, idVec3 v2, int color );
void GLS_BeginScene( void ); void GLS_BeginScene();
void GLS_Winding( const idWinding* w, int code ); void GLS_Winding( const idWinding* w, int code );
void GLS_Triangle( const mapTri_t* tri, int code ); void GLS_Triangle( const mapTri_t* tri, int code );
void GLS_EndScene( void ); void GLS_EndScene();
@ -386,7 +386,7 @@ void LeakFile( tree_t* tree );
// facebsp.cpp // facebsp.cpp
tree_t* AllocTree( void ); tree_t* AllocTree();
void FreeTree( tree_t* tree ); void FreeTree( tree_t* tree );
@ -414,7 +414,7 @@ void Prelight( uEntity_t* e );
struct hashVert_s* GetHashVert( idVec3& v ); struct hashVert_s* GetHashVert( idVec3& v );
void HashTriangles( optimizeGroup_t* groupList ); void HashTriangles( optimizeGroup_t* groupList );
void FreeTJunctionHash( void ); void FreeTJunctionHash();
int CountGroupListTris( const optimizeGroup_t* groupList ); int CountGroupListTris( const optimizeGroup_t* groupList );
void FixEntityTjunctions( uEntity_t* e ); void FixEntityTjunctions( uEntity_t* e );
void FixAreaGroupsTjunctions( optimizeGroup_t* groupList ); void FixAreaGroupsTjunctions( optimizeGroup_t* groupList );
@ -473,7 +473,7 @@ void OptimizeGroupList( optimizeGroup_t* groupList );
// tritools.cpp // tritools.cpp
mapTri_t* AllocTri( void ); mapTri_t* AllocTri();
void FreeTri( mapTri_t* tri ); void FreeTri( mapTri_t* tri );
int CountTriList( const mapTri_t* list ); int CountTriList( const mapTri_t* list );
mapTri_t* MergeTriLists( mapTri_t* a, mapTri_t* b ); mapTri_t* MergeTriLists( mapTri_t* a, mapTri_t* b );
@ -496,7 +496,7 @@ void ClipTriList( const mapTri_t* list, const idPlane& plane, float epsilon, ma
// output.cpp // output.cpp
srfTriangles_t* ShareMapTriVerts( const mapTri_t* tris ); srfTriangles_t* ShareMapTriVerts( const mapTri_t* tris );
void WriteOutputFile( void ); void WriteOutputFile();
//============================================================================= //=============================================================================

2
neo/tools/compilers/dmap/facebsp.cpp
View file

@ -163,7 +163,7 @@ void PrintTree_r( node_t* node, int depth )
AllocBspFace AllocBspFace
================ ================
*/ */
bspface_t* AllocBspFace( void ) bspface_t* AllocBspFace()
{ {
bspface_t* f; bspface_t* f;

18
neo/tools/compilers/dmap/gldraw.cpp
View file

@ -39,7 +39,7 @@ If you have questions concerning this license or the applicable additional terms
#define WIN_SIZE 1024 #define WIN_SIZE 1024
void Draw_ClearWindow( void ) void Draw_ClearWindow()
{ {
if( !dmapGlobals.drawflag ) if( !dmapGlobals.drawflag )
@ -102,7 +102,7 @@ void Draw_ClearWindow( void )
} }
void Draw_SetRed( void ) void Draw_SetRed()
{ {
if( !dmapGlobals.drawflag ) if( !dmapGlobals.drawflag )
return; return;
@ -110,7 +110,7 @@ void Draw_SetRed( void )
glColor3f( 1, 0, 0 ); glColor3f( 1, 0, 0 );
} }
void Draw_SetGrey( void ) void Draw_SetGrey()
{ {
if( !dmapGlobals.drawflag ) if( !dmapGlobals.drawflag )
return; return;
@ -118,7 +118,7 @@ void Draw_SetGrey( void )
glColor3f( 0.5f, 0.5f, 0.5f ); glColor3f( 0.5f, 0.5f, 0.5f );
} }
void Draw_SetBlack( void ) void Draw_SetBlack()
{ {
if( !dmapGlobals.drawflag ) if( !dmapGlobals.drawflag )
return; return;
@ -220,7 +220,7 @@ void DrawLine( idVec3 v1, idVec3 v2, int color )
bool wins_init; bool wins_init;
int draw_socket; int draw_socket;
void GLS_BeginScene( void ) void GLS_BeginScene()
{ {
WSADATA winsockdata; WSADATA winsockdata;
WORD wVersionRequested; WORD wVersionRequested;
@ -285,7 +285,7 @@ void GLS_Triangle( const mapTri_t* tri, int code )
GLS_Winding( &w, code ); GLS_Winding( &w, code );
} }
void GLS_EndScene( void ) void GLS_EndScene()
{ {
closesocket( draw_socket ); closesocket( draw_socket );
draw_socket = 0; draw_socket = 0;
@ -293,7 +293,7 @@ void GLS_EndScene( void )
#else #else
void Draw_ClearWindow( void ) void Draw_ClearWindow()
{ {
} }
@ -309,11 +309,11 @@ void GLS_Winding( const idWinding* w, int code )
{ {
} }
void GLS_BeginScene( void ) void GLS_BeginScene()
{ {
} }
void GLS_EndScene( void ) void GLS_EndScene()
{ {
} }

6
neo/tools/compilers/dmap/map.cpp
View file

@ -145,7 +145,7 @@ static void SetBrushContents( uBrush_t* b )
FreeBuildBrush FreeBuildBrush
=============== ===============
*/ */
static void FreeBuildBrush( void ) static void FreeBuildBrush()
{ {
int i; int i;
@ -167,7 +167,7 @@ Produces a final brush based on the buildBrush->sides array
and links it to the current entity and links it to the current entity
=============== ===============
*/ */
static uBrush_t* FinishBrush( void ) static uBrush_t* FinishBrush()
{ {
uBrush_t* b; uBrush_t* b;
primitive_t* prim; primitive_t* prim;
@ -616,7 +616,7 @@ void FreeOptimizeGroupList( optimizeGroup_t* groups )
FreeDMapFile FreeDMapFile
================ ================
*/ */
void FreeDMapFile( void ) void FreeDMapFile()
{ {
int i, j; int i, j;

4
neo/tools/compilers/dmap/optimize.cpp
View file

@ -106,7 +106,7 @@ static void ValidateEdgeCounts( optIsland_t* island )
AllocEdge AllocEdge
==================== ====================
*/ */
static optEdge_t* AllocEdge( void ) static optEdge_t* AllocEdge()
{ {
optEdge_t* e; optEdge_t* e;
@ -259,7 +259,7 @@ static optVertex_t* FindOptVertex( idDrawVert* v, optimizeGroup_t* opt )
DrawAllEdges DrawAllEdges
================ ================
*/ */
static void DrawAllEdges( void ) static void DrawAllEdges()
{ {
// int i; // int i;

2
neo/tools/compilers/dmap/output.cpp
View file

@ -670,7 +670,7 @@ static void WriteOutputEntity( int entityNum )
WriteOutputFile WriteOutputFile
==================== ====================
*/ */
void WriteOutputFile( void ) void WriteOutputFile()
{ {
int i; int i;
uEntity_t* entity; uEntity_t* entity;

2
neo/tools/compilers/dmap/portals.cpp
View file

@ -44,7 +44,7 @@ int c_peak_portals;
AllocPortal AllocPortal
=========== ===========
*/ */
uPortal_t* AllocPortal( void ) uPortal_t* AllocPortal()
{ {
uPortal_t* p; uPortal_t* p;

2
neo/tools/compilers/dmap/tritjunction.cpp
View file

@ -290,7 +290,7 @@ The optimizer may add some more crossing verts
after t junction processing after t junction processing
================= =================
*/ */
void FreeTJunctionHash( void ) void FreeTJunctionHash()
{ {
int i, j, k; int i, j, k;
hashVert_t* hv, *next; hashVert_t* hv, *next;

2
neo/tools/compilers/dmap/tritools.cpp
View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
AllocTri AllocTri
=============== ===============
*/ */
mapTri_t* AllocTri( void ) mapTri_t* AllocTri()
{ {
mapTri_t* tri; mapTri_t* tri;

4
neo/tools/compilers/dmap/ubrush.cpp
View file

@ -497,7 +497,7 @@ void FilterBrushesIntoTree( uEntity_t* e )
AllocTree AllocTree
================ ================
*/ */
tree_t* AllocTree( void ) tree_t* AllocTree()
{ {
tree_t* tree; tree_t* tree;
@ -513,7 +513,7 @@ tree_t* AllocTree( void )
AllocNode AllocNode
================ ================
*/ */
node_t* AllocNode( void ) node_t* AllocNode()
{ {
node_t* node; node_t* node;