Merge branch 'master' of https://github.com/FWGS/xash3d-fwgs into switch_newer
This commit is contained in:
commit
65095df124
|
@ -63,7 +63,7 @@ static struct
|
|||
VGUI_CursorSelect,
|
||||
VGUI_GetColor,
|
||||
VGUI_IsInGame,
|
||||
NULL,
|
||||
Key_EnableTextInput,
|
||||
VGUI_GetMousePos,
|
||||
VGUI_UtfProcessChar,
|
||||
Platform_GetClipboardText,
|
||||
|
|
|
@ -180,7 +180,7 @@ typedef struct vguiapi_s
|
|||
void (*CursorSelect)( VGUI_DefaultCursor cursor );
|
||||
byte (*GetColor)( int i, int j );
|
||||
qboolean (*IsInGame)( void );
|
||||
void (*Unused)( void );
|
||||
void (*EnableTextInput)( qboolean enable, qboolean force );
|
||||
void (*GetCursorPos)( int *x, int *y );
|
||||
int (*ProcessUtfChar)( int ch );
|
||||
int (*GetClipboardText)( char *buffer, size_t bufferSize );
|
||||
|
|
|
@ -119,7 +119,7 @@ void GAME_EXPORT TriBegin( int mode1 )
|
|||
if( mode1 == TRI_QUADS )
|
||||
mode1 = TRI_TRIANGLE_FAN;
|
||||
mode = mode1;
|
||||
vertcount = n = vertcount = 0;
|
||||
n = vertcount = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
3
wscript
3
wscript
|
@ -218,6 +218,9 @@ def configure(conf):
|
|||
'-Werror=sizeof-pointer-memaccess',
|
||||
'-Werror=sizeof-array-div',
|
||||
'-Werror=sizeof-pointer-div',
|
||||
'-Werror=string-compare',
|
||||
'-Werror=use-after-free=3',
|
||||
'-Werror=sequence-point',
|
||||
# '-Werror=format=2',
|
||||
# '-Wdouble-promotion', # disable warning flood
|
||||
'-Wstrict-aliasing',
|
||||
|
|
Loading…
Reference in New Issue