Skip to content

Commit ede7308

Browse files
cgame - game - q3_ui: Apply more Quake3e patches, apply new UI design on DEMOS menu and fix DLL/SO implicit error from __scalbnf
1 parent e800128 commit ede7308

22 files changed

Lines changed: 1837 additions & 579 deletions

source/cgame/cg_info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ void CG_LoadingClient( int clientNum ) {
127127
}
128128
}
129129

130-
Q_strncpyz( personality, Info_ValueForKey( info, "n" ), sizeof(personality) );
131-
Q_CleanStr( personality );
130+
BG_CleanName( Info_ValueForKey( info, "n" ), personality, sizeof( personality ), "unknown client" );
131+
BG_StripColor( personality );
132132

133133
if( cgs.gametype == GT_SINGLE_PLAYER ) {
134134
trap_S_RegisterSound( va( "sound/player/announce/%s.wav", personality ), qtrue );

source/cgame/cg_local.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ int trap_FS_FOpenFile( const char *qpath, fileHandle_t *f, fsMode_t mode );
14141414
void trap_FS_Read( void *buffer, int len, fileHandle_t f );
14151415
void trap_FS_Write( const void *buffer, int len, fileHandle_t f );
14161416
void trap_FS_FCloseFile( fileHandle_t f );
1417-
int trap_FS_Seek( fileHandle_t f, long offset, int origin ); // fsOrigin_t
1417+
int trap_FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin );
14181418

14191419
// add commands to the local console as if they were typed in
14201420
// for map changing, etc. The command is not executed immediately,

source/cgame/cg_syscalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void trap_FS_FCloseFile( fileHandle_t f ) {
9898
syscall( CG_FS_FCLOSEFILE, f );
9999
}
100100

101-
int trap_FS_Seek( fileHandle_t f, long offset, int origin ) {
101+
int trap_FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
102102
return syscall( CG_FS_SEEK, f, offset, origin );
103103
}
104104

source/cgame/tr_types.h

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,26 @@ typedef enum {
148148
TC_S3TC
149149
} textureCompression_t;
150150

151-
152-
// <artem>
153-
// glDriverType_t is not used by the engine and quake3 game anymore.
154-
// Single value (GLDRV_ICD) is left only for compatibility with other mods.
155151
typedef enum {
156-
GLDRV_ICD // driver is integrated with window system
152+
GLDRV_ICD, // driver is integrated with window system
153+
// WARNING: there are tests that check for
154+
// > GLDRV_ICD for minidriverness, so this
155+
// should always be the lowest value in this
156+
// enum set
157+
GLDRV_STANDALONE, // driver is a non-3Dfx standalone driver
158+
GLDRV_VOODOO // driver is a 3Dfx standalone driver
157159
} glDriverType_t;
158-
// </artem>
159160

160-
// <artem>
161-
// glHardwareType_t is not used by the engine and quake3 game anymore.
162-
// Single value (GLHW_GENERIC) is left only for compatibility with other mods.
163161
typedef enum {
164-
GLHW_GENERIC // where everthing works the way it should
162+
GLHW_GENERIC, // where everthing works the way it should
163+
GLHW_3DFX_2D3D, // Voodoo Banshee or Voodoo3, relevant since if this is
164+
// the hardware type then there can NOT exist a secondary
165+
// display adapter
166+
GLHW_RIVA128, // where you can't interpolate alpha
167+
GLHW_RAGEPRO, // where you can't modulate alpha on alpha textures
168+
GLHW_PERMEDIA2 // where you don't have src*dst
165169
} glHardwareType_t;
166-
// </artem>
170+
167171

168172
typedef struct {
169173
char renderer_string[MAX_STRING_CHARS];

0 commit comments

Comments
 (0)