ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes and annotations

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-11 20:15:50 +02:00
parent 2fd927bd4b
commit 6578cfdd51
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/game/q_shared.h
View file

@ -760,7 +760,7 @@ void Swap_Init (void);
//
// key / value info strings
//
char *Info_ValueForKey( const char *s, const char *key );
char *Info_ValueForKey( /*@out@*/ const char *s, const char *key );
void Info_RemoveKey( char *s, const char *key );
void Info_RemoveKey_big( char *s, const char *key );
void Info_SetValueForKey( char *s, const char *key, const char *value );

23
code/ui/ui_addbots.c
View file

@ -62,9 +62,9 @@ static void UI_AddBotsMenu_BotEvent( void* ptr, int event ) {
return;
}
addBotsMenuInfo.bots[addBotsMenuInfo.selectedBotNum].color = colorTable[CT_DKGOLD1];
addBotsMenuInfo.bots[addBotsMenuInfo.selectedBotNum].color = (float*)colorTable[CT_DKGOLD1];
addBotsMenuInfo.selectedBotNum = ((menucommon_s*)ptr)->id - ID_BOTNAME0;
addBotsMenuInfo.bots[addBotsMenuInfo.selectedBotNum].color = colorTable[CT_YELLOW];
addBotsMenuInfo.bots[addBotsMenuInfo.selectedBotNum].color = (float*)colorTable[CT_YELLOW];
}
@ -73,7 +73,7 @@ static void UI_AddBotsMenu_BotEvent( void* ptr, int event ) {
UI_AddBotsMenu_BackEvent
=================
*/
static void UI_AddBotsMenu_BackEvent( void* ptr, int event ) {
static void UI_AddBotsMenu_BackEvent( /*@unused@*/ void* ptr, int event ) {
if (event != QM_ACTIVATED) {
return;
}
@ -88,7 +88,7 @@ UI_AddBotsMenu_SetBotNames
*/
static void UI_AddBotsMenu_SetBotNames( void ) {
int n;
const char *info;
const /*@shared@*/ char *info;
for ( n = 0; n < BOTS_VIEWABLE; n++ )
{
@ -104,7 +104,7 @@ static void UI_AddBotsMenu_SetBotNames( void ) {
UI_AddBotsMenu_UpEvent
=================
*/
static void UI_AddBotsMenu_UpEvent( void* ptr, int event ) {
static void UI_AddBotsMenu_UpEvent( /*@unused@*/ void* ptr, int event ) {
if (event != QM_ACTIVATED) {
return;
}
@ -121,7 +121,7 @@ static void UI_AddBotsMenu_UpEvent( void* ptr, int event ) {
UI_AddBotsMenu_DownEvent
=================
*/
static void UI_AddBotsMenu_DownEvent( void* ptr, int event ) {
static void UI_AddBotsMenu_DownEvent( /*@unused@*/ void* ptr, int event ) {
if (event != QM_ACTIVATED) {
return;
}
@ -140,8 +140,10 @@ UI_AddBotsMenu_GetSortedBotNums
*/
static int QDECL UI_AddBotsMenu_SortCompare( const void *arg1, const void *arg2 ) {
int num1, num2;
const char *info1, *info2;
const char *name1, *name2;
const /*@shared@*/ char* info1;
const /*@shared@*/ char* info2;
const /*@shared@*/ char* name1;
const /*@shared@*/ char* name2;
num1 = *(int *)arg1;
num2 = *(int *)arg2;
@ -163,7 +165,7 @@ static void UI_AddBotsMenu_GetSortedBotNums( void ) {
addBotsMenuInfo.sortedBotNums[n] = n;
}
qsort( addBotsMenuInfo.sortedBotNums, addBotsMenuInfo.numBots, sizeof(addBotsMenuInfo.sortedBotNums[0]), UI_AddBotsMenu_SortCompare );
qsort( addBotsMenuInfo.sortedBotNums, (size_t)addBotsMenuInfo.numBots, sizeof(addBotsMenuInfo.sortedBotNums[0]), UI_AddBotsMenu_SortCompare );
}
@ -274,7 +276,7 @@ static char* Game_pClassNames2[] =
UI_AddBotsMenu_FightEvent
=================
*/
static void UI_AddBotsMenu_FightEvent( void* ptr, int event ) {
static void UI_AddBotsMenu_FightEvent( /*@unused@*/ void* ptr, int event ) {
const char *team;
const char *pclass;
int skill;
@ -314,6 +316,7 @@ static void UI_AddBotsMenu_Init( void )
int count;
char info[MAX_INFO_STRING];
memset(info, 0, sizeof(char) * MAX_INFO_STRING);
trap_GetConfigString(CS_SERVERINFO, info, MAX_INFO_STRING);
gametype = atoi( Info_ValueForKey( info,"g_gametype" ) );
specialties = atoi( Info_ValueForKey( info,"g_pModSpecialties" ) );

10
code/ui/ui_local.h
View file

@ -1483,7 +1483,7 @@ typedef struct _tag_menuframework
typedef struct
{
int type;
const char *name;
const /*@shared@*/ char *name;
int id;
int x, y;
int left;
@ -1675,8 +1675,8 @@ typedef struct
int normaltextEnum3; // Enum from normal menu text
int buttontextEnum3; // Enum from button text
int style;
float *color; // Normal color
float *color2; // Highlight color
/*@shared@*/ float *color; // Normal color
/*@shared@*/ float *color2; // Highlight color
int focusX;
int focusY;
int focusWidth;
@ -2401,8 +2401,8 @@ int UI_GetNumSPTiers( void );
void UI_ServerAdvancedOptions(int fromMenu);
char *UI_GetBotInfoByNumber( int num );
char *UI_GetBotInfoByName( const char *name );
/*@shared@*/ char *UI_GetBotInfoByNumber( int num );
/*@shared@*/ char *UI_GetBotInfoByName( const char *name );
int UI_GetNumBots( void );
void UI_GetBestScore( int level, int *score, int *skill );