Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions Core/GameEngine/Include/Common/ArchiveFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ class ArchiveFile

virtual Bool getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< fill in the fileInfo struct with info about the file requested.
virtual File* openFile( const Char *filename, Int access = 0) = 0; ///< Open the specified file within the archive file
virtual void closeAllFiles( void ) = 0; ///< Close all file opened in this archive file
virtual AsciiString getName( void ) = 0; ///< Returns the name of the archive file
virtual AsciiString getPath( void ) = 0; ///< Returns full path and name of archive file
virtual void closeAllFiles() = 0; ///< Close all file opened in this archive file
virtual AsciiString getName() = 0; ///< Returns the name of the archive file
virtual AsciiString getPath() = 0; ///< Returns full path and name of archive file
virtual void setSearchPriority( Int new_priority ) = 0; ///< Set this archive file's search priority
virtual void close( void ) = 0; ///< Close this archive file
virtual void close() = 0; ///< Close this archive file
void attachFile(File *file);

void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
Expand Down
14 changes: 7 additions & 7 deletions Core/GameEngine/Include/Common/ArchiveFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,19 @@ class ArchiveFileSystem : public SubsystemInterface
ArchiveFileSystem();
virtual ~ArchiveFileSystem();

virtual void init( void ) = 0;
virtual void update( void ) = 0;
virtual void reset( void ) = 0;
virtual void postProcessLoad( void ) = 0;
virtual void init() = 0;
virtual void update() = 0;
virtual void reset() = 0;
virtual void postProcessLoad() = 0;

// ArchiveFile operations
virtual ArchiveFile* openArchiveFile( const Char *filename ) = 0; ///< Create new or return existing Archive file from file name
virtual void closeArchiveFile( const Char *filename ) = 0; ///< Close the one specified big file.
virtual void closeAllArchiveFiles( void ) = 0; ///< Close all Archive files currently open
virtual void closeAllArchiveFiles() = 0; ///< Close all Archive files currently open

// File operations
virtual File* openFile( const Char *filename, Int access = 0, FileInstance instance = 0); ///< Search Archive files for specified file name and open it if found
virtual void closeAllFiles( void ) = 0; ///< Close all files associated with Archive files
virtual void closeAllFiles() = 0; ///< Close all files associated with Archive files
virtual Bool doesFileExist(const Char *filename, FileInstance instance = 0) const; ///< return true if that file exists in an archive file somewhere.

void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep). Possibly search subdirectories. Scans each Archive file.
Expand All @@ -149,7 +149,7 @@ class ArchiveFileSystem : public SubsystemInterface
// Unprotected this for copy-protection routines
ArchiveFile* getArchiveFile(const AsciiString& filename, FileInstance instance = 0) const;

void loadMods( void );
void loadMods();

ArchivedDirectoryInfo* friend_getArchivedDirectoryInfo(const Char* directory);

Expand Down
6 changes: 3 additions & 3 deletions Core/GameEngine/Include/Common/AsciiString.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@ class AsciiString
/**
Remove leading and trailing whitespace from the string.
*/
void trim( void );
void trim();

/**
Remove trailing whitespace from the string.
*/
void trimEnd(void);
void trimEnd();

/**
Remove all consecutive occurrences of c from the end of the string.
Expand All @@ -259,7 +259,7 @@ class AsciiString
/**
Make the string lowercase
*/
void toLower( void );
void toLower();

/**
Remove the final character in the string. If the string is empty,
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/Common/AudioEventInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,5 @@ struct AudioEventInfo : public MemoryPoolObject
Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 ); }

static const FieldParse m_audioEventInfo[]; ///< the parse table for INI definition
const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
const FieldParse *getFieldParse() const { return m_audioEventInfo; }
};
64 changes: 32 additions & 32 deletions Core/GameEngine/Include/Common/AudioEventRTS.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,95 +61,95 @@ enum AudioPriority CPP_11(: Int);
class AudioEventRTS
{
public:
AudioEventRTS( );
AudioEventRTS();
AudioEventRTS( const AsciiString& eventName );
AudioEventRTS( const AsciiString& eventName, ObjectID ownerID );
AudioEventRTS( const AsciiString& eventName, DrawableID drawableID ); // Pass 0 for unused if attaching to drawable
AudioEventRTS( const AsciiString& eventName, const Coord3D *positionOfAudio );

virtual ~AudioEventRTS( );
virtual ~AudioEventRTS();

AudioEventRTS( const AudioEventRTS& right );
AudioEventRTS& operator=( const AudioEventRTS& right );

void setEventName( AsciiString name );
const AsciiString& getEventName( void ) const { return m_eventName; }
const AsciiString& getEventName() const { return m_eventName; }

// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is
// specified.
void generateFilename( void );
AsciiString getFilename( void );
void generateFilename();
AsciiString getFilename();

// The attack and decay sounds are generated in generatePlayInfo, because they will never be played more
// than once during a given sound event.
void generatePlayInfo( void );
Real getPitchShift( void ) const;
Real getVolumeShift( void ) const;
AsciiString getAttackFilename( void ) const;
AsciiString getDecayFilename( void ) const;
Real getDelay( void ) const;
void generatePlayInfo();
Real getPitchShift() const;
Real getVolumeShift() const;
AsciiString getAttackFilename() const;
AsciiString getDecayFilename() const;
Real getDelay() const;

void decrementDelay( Real timeToDecrement );

PortionToPlay getNextPlayPortion( void ) const;
void advanceNextPlayPortion( void );
PortionToPlay getNextPlayPortion() const;
void advanceNextPlayPortion();
void setNextPlayPortion( PortionToPlay ptp );

void decreaseLoopCount( void );
Bool hasMoreLoops( void ) const;
void decreaseLoopCount();
Bool hasMoreLoops() const;

void setAudioEventInfo( const AudioEventInfo *eventInfo ) const; // is mutable
const AudioEventInfo *getAudioEventInfo( void ) const;
const AudioEventInfo *getAudioEventInfo() const;

void setPlayingHandle( AudioHandle handle ); // for ID of this audio piece.
AudioHandle getPlayingHandle( void ); // for ID of this audio piece
AudioHandle getPlayingHandle(); // for ID of this audio piece

void setPosition( const Coord3D *pos );
const Coord3D* getPosition( void );
const Coord3D* getPosition();

void setObjectID( ObjectID objID );
ObjectID getObjectID( void );
ObjectID getObjectID();

Bool isDead() const { return m_ownerType == OT_Dead; }
OwnerType getOwnerType() const { return m_ownerType; }

void setDrawableID( DrawableID drawID );
DrawableID getDrawableID( void );
DrawableID getDrawableID();

void setTimeOfDay( TimeOfDay tod );
TimeOfDay getTimeOfDay( void ) const;
TimeOfDay getTimeOfDay() const;

void setHandleToKill( AudioHandle handleToKill );
AudioHandle getHandleToKill( void ) const;
AudioHandle getHandleToKill() const;

void setShouldFade( Bool shouldFade );
Bool getShouldFade( void ) const;
Bool getShouldFade() const;

void setIsLogicalAudio( Bool isLogicalAudio );
Bool getIsLogicalAudio( void ) const;
Bool getIsLogicalAudio() const;

Bool isPositionalAudio( void ) const;
Bool isCurrentlyPlaying( void ) const;
Bool isPositionalAudio() const;
Bool isCurrentlyPlaying() const;

AudioPriority getAudioPriority( void ) const;
AudioPriority getAudioPriority() const;
void setAudioPriority( AudioPriority newPriority );

Real getVolume( void ) const;
Real getVolume() const;
void setVolume( Real vol );

Int getPlayerIndex( void ) const;
Int getPlayerIndex() const;
void setPlayerIndex( Int playerNdx );

Int getPlayingAudioIndex( void ) const { return m_playingAudioIndex; }
Int getPlayingAudioIndex() const { return m_playingAudioIndex; }
void setPlayingAudioIndex( Int pai ) const { m_playingAudioIndex = pai; } // is mutable

Bool getUninterruptible( ) const { return m_uninterruptible; }
Bool getUninterruptible() const { return m_uninterruptible; }
void setUninterruptible( Bool uninterruptible ) { m_uninterruptible = uninterruptible; }


// This will retrieve the appropriate position based on type.
const Coord3D *getCurrentPosition( void );
const Coord3D *getCurrentPosition();

// This will return the directory leading up to the appropriate type, including the trailing '\\'
// If localized is true, we'll append a language specific directory to the end of the path.
Expand Down
6 changes: 3 additions & 3 deletions Core/GameEngine/Include/Common/CRCDebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
void dumpMatrix3D(const Matrix3D *m, AsciiString name, AsciiString fname, Int line);
void dumpReal(Real r, AsciiString name, AsciiString fname, Int line);

void outputCRCDebugLines( void );
void CRCDebugStartNewGame( void );
void outputCRCDumpLines( void );
void outputCRCDebugLines();
void CRCDebugStartNewGame();
void outputCRCDumpLines();

void addCRCDebugLine(const char *fmt, ...);
void addCRCDebugLineNoCounter(const char *fmt, ...);
Expand Down
Loading
Loading