Warning fixes. A lot of x86_64 stuff.
diff --git a/src/engine/API/CVarSystem_api.hpp b/src/engine/API/CVarSystem_api.hpp
index 0d1a2ff..26628b8 100644
--- a/src/engine/API/CVarSystem_api.hpp
+++ b/src/engine/API/CVarSystem_api.hpp
@@ -121,8 +121,8 @@ public:
virtual float32 VariableValue( pointer var_name ) = 0;
virtual sint VariableIntegerValue( pointer var_name ) = 0;
virtual valueType* VariableString( pointer var_name ) = 0;
- virtual void VariableStringBuffer( pointer var_name, valueType* buffer, sint bufsize ) = 0;
- virtual void LatchedVariableStringBuffer( pointer var_name, valueType* buffer, sint bufsize ) = 0;
+ virtual void VariableStringBuffer( pointer var_name, valueType* buffer, uint64 bufsize ) = 0;
+ virtual void LatchedVariableStringBuffer( pointer var_name, valueType* buffer, uint64 bufsize ) = 0;
virtual sint Flags( pointer var_name ) = 0;
virtual void CommandCompletion( void( *callback )( pointer s ) ) = 0;
virtual valueType* ClearForeignCharacters( pointer value ) = 0;
@@ -139,7 +139,7 @@ public:
virtual void WriteVariables( fileHandle_t f ) = 0;
virtual valueType* InfoString( sint bit ) = 0;
virtual valueType* InfoString_Big( sint bit ) = 0;
- virtual void InfoStringBuffer( sint bit, valueType* buff, sint buffsize ) = 0;
+ virtual void InfoStringBuffer( sint bit, valueType* buff, uint64 buffsize ) = 0;
virtual void CheckRange( convar_t* var, float32 min, float32 max, bool integral ) = 0;
virtual void Register( vmConvar_t* vmCvar, pointer varName, pointer defaultValue, sint flags, pointer description ) = 0;
virtual void Update( vmConvar_t* vmCvar ) = 0;
diff --git a/src/engine/API/CmdCompletion_api.hpp b/src/engine/API/CmdCompletion_api.hpp
index b197ae0..f2f3ab9 100644
--- a/src/engine/API/CmdCompletion_api.hpp
+++ b/src/engine/API/CmdCompletion_api.hpp
@@ -46,9 +46,7 @@ Edit fields and command line history/completion
#define MAX_EDIT_LINE 256
typedef struct
{
- sint cursor;
- sint scroll;
- sint widthInChars;
+ uint64 cursor, scroll, widthInChars;
valueType buffer[MAX_EDIT_LINE];
} field_t;
@@ -71,7 +69,7 @@ public:
virtual void Draw( field_t* edit, sint x, sint y, bool showCursor, bool noColorEscape, float32 alpha ) = 0;
virtual void BigDraw( field_t* edit, sint x, sint y, bool showCursor, bool noColorEscape ) = 0;
virtual void KeyDownEvent( field_t* edit, sint key ) = 0;
- virtual void CharEvent( field_t* edit, sint ch ) = 0;
+ virtual void CharEvent( field_t* edit, valueType ch ) = 0;
};
extern idCmdCompletionSystem* cmdCompletionSystem;
diff --git a/src/engine/API/CmdSystem_api.hpp b/src/engine/API/CmdSystem_api.hpp
index 2edc134..5b7ffdd 100644
--- a/src/engine/API/CmdSystem_api.hpp
+++ b/src/engine/API/CmdSystem_api.hpp
@@ -66,9 +66,9 @@ public:
virtual void SaveCmdContext( void ) = 0;
virtual void RestoreCmdContext( void ) = 0;
virtual valueType* FromNth( sint count ) = 0;
- virtual void ArgvBuffer( sint arg, valueType* buffer, sint bufferLength ) = 0;
- virtual void ArgsBuffer( valueType* buffer, sint bufferLength ) = 0;
- virtual void LiteralArgsBuffer( valueType* buffer, sint bufferLength ) = 0;
+ virtual void ArgvBuffer( sint arg, valueType* buffer, uint64 bufferLength ) = 0;
+ virtual void ArgsBuffer( valueType* buffer, uint64 bufferLength ) = 0;
+ virtual void LiteralArgsBuffer( valueType* buffer, uint64 bufferLength ) = 0;
};
extern idCmdSystem* cmdSystem;
diff --git a/src/engine/API/FileSystem_api.hpp b/src/engine/API/FileSystem_api.hpp
index d7045c9..d005db8 100644
--- a/src/engine/API/FileSystem_api.hpp
+++ b/src/engine/API/FileSystem_api.hpp
@@ -60,7 +60,7 @@ typedef struct pack_s
sint pure_checksum; // checksum for pure
sint numfiles; // number of files in pk3
sint referenced; // referenced file flags
- sint hashSize; // hash table size (power of 2)
+ uint64 hashSize; // hash table size (power of 2)
fileInPack_t** hashTable; // hash table
fileInPack_t* buildBuffer; // buffer with the filenames etc.
} pack_t;
@@ -74,7 +74,7 @@ public:
virtual bool Initialized( void ) = 0;
virtual bool PakIsPure( pack_t* pack ) = 0;
virtual sint LoadStack( void ) = 0;
- virtual sint32 HashFileName( pointer fname, sint hashSize ) = 0;
+ virtual sint32 HashFileName( pointer fname, uint64 hashSize ) = 0;
virtual fileHandle_t HandleForFile( void ) = 0;
virtual FILE* FileForHandle( fileHandle_t f ) = 0;
virtual void ForceFlush( fileHandle_t f ) = 0;
@@ -121,17 +121,17 @@ public:
virtual pack_t* LoadZipFile( pointer zipfile, pointer basename ) = 0;
virtual sint ReturnPath( pointer zname, valueType* zpath, sint* depth ) = 0;
virtual sint AddFileToList( valueType* name, valueType* list[MAX_FOUND_FILES], sint nfiles ) = 0;
- virtual valueType** ListFilteredFiles( pointer path, pointer extension, valueType* filter, sint* numfiles ) = 0;
- virtual valueType** ListFiles( pointer path, pointer extension, sint* numfiles ) = 0;
+ virtual valueType** ListFilteredFiles( pointer path, pointer extension, valueType* filter, uint64* numfiles ) = 0;
+ virtual valueType** ListFiles( pointer path, pointer extension, uint64* numfiles ) = 0;
virtual void FreeFileList( valueType** list ) = 0;
- virtual sint GetFileList( pointer path, pointer extension, valueType* listbuf, sint bufsize ) = 0;
+ virtual uint64 GetFileList( pointer path, pointer extension, valueType* listbuf, uint64 bufsize ) = 0;
virtual uint CountFileList( valueType** list ) = 0;
virtual valueType** ConcatenateFileLists( valueType** list0, valueType** list1, valueType** list2 ) = 0;
- virtual sint GetModList( valueType* listbuf, sint bufsize ) = 0;
+ virtual uint64 GetModList( valueType* listbuf, uint64 bufsize ) = 0;
virtual void ConvertPath( valueType* s ) = 0;
virtual sint PathCmp( pointer s1, pointer s2 ) = 0;
- virtual void SortFileList( valueType** filelist, sint numfiles ) = 0;
- virtual bool IsExt( pointer filename, pointer ext, sint namelen ) = 0;
+ virtual void SortFileList( valueType** filelist, uint64 numfiles ) = 0;
+ virtual bool IsExt( pointer filename, pointer ext, uint64 namelen ) = 0;
virtual bool idPak( valueType* pak, valueType* base ) = 0;
virtual bool VerifyOfficialPaks( void ) = 0;
virtual bool ComparePaks( valueType* neededpaks, sint len, bool dlstring ) = 0;
diff --git a/src/engine/API/MD5_api.hpp b/src/engine/API/MD5_api.hpp
index 8aa29b0..8b275f7 100644
--- a/src/engine/API/MD5_api.hpp
+++ b/src/engine/API/MD5_api.hpp
@@ -43,7 +43,7 @@
class idMD5System
{
public:
- virtual valueType* MD5File( pointer fn, sint length, pointer prefix, sint prefix_len ) = 0;
+ virtual valueType* MD5File( pointer fn, sint length, pointer prefix, uint64 prefix_len ) = 0;
};
extern idMD5System* MD5System;
diff --git a/src/engine/API/bgame_api.hpp b/src/engine/API/bgame_api.hpp
index b6e9ec7..1dd759e 100644
--- a/src/engine/API/bgame_api.hpp
+++ b/src/engine/API/bgame_api.hpp
@@ -48,7 +48,7 @@
// from the server to all connected clients.
//
-// CS_SERVERINFO and CS_SYSTEMINFO are defined in q_shared.h
+// CS_SERVERINFO and CS_SYSTEMINFO are defined in q_shared.hpp
#define CS_MUSIC 2
#define CS_MESSAGE 3 // from the map worldspawn's message field
#define CS_MOTD 4 // g_motd string for server message of the day
diff --git a/src/engine/API/cgame_api.hpp b/src/engine/API/cgame_api.hpp
index d603365..8ce3e80 100644
--- a/src/engine/API/cgame_api.hpp
+++ b/src/engine/API/cgame_api.hpp
@@ -83,14 +83,14 @@ struct cgameImports_t
void( *CIN_SetExtents )( sint handle, sint x, sint y, sint w, sint h );
void( *UI_LimboChat )( pointer arg0 );
void ( *AddReliableCommand )( pointer cmd );
- void ( *Cvar_LatchedVariableStringBuffer )( pointer var_name, valueType* buffer, sint bufsize );
[... diff too long, it was truncated ...]
GitHub
sha: 5e417021