rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 04:32:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Got rid of the warnings lcc liked to share with the world

Browse source
This commit is contained in:
Andrei Drexler 2006-07-24 17:16:12 +00:00
parent 8540d5b4e1
commit 4163baf9ad
4 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/g_misc.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.85 2006/07/24 17:15:56 makro
// Got rid of the warnings lcc liked to share with the world
//
// Revision 1.84 2005/09/07 20:27:42 makro
// Entity attachment trees
//
@ -1179,7 +1182,7 @@ void SP_func_breakable(gentity_t * ent)
if (ent->spawnflags & 16) {
ent->touch = Touch_Breakable;
} else {
ent->touch = NULL;
ent->touch = 0;
}
if (!ent->damage_radius) {

6
reaction/game/g_parser.c
View file

@ -76,7 +76,7 @@ void Script_InitHashTable(TParseState *state)
state->initialized = 1;
}
TParseFunc Script_FindHandler(char *token, TParseState* state)
PParseFunc Script_FindHandler(char *token, TParseState* state)
{
TParseRule *ptr;
int index = Script_HashKey(token) % SCRIPT_HASH_SIZE;
@ -89,7 +89,7 @@ TParseFunc Script_FindHandler(char *token, TParseState* state)
if (Q_stricmp(token, ptr->keyword) == 0)
return ptr->handler;
}
return NULL;
return (PParseFunc)0;
}
@ -157,7 +157,7 @@ void Script_ParseString(char *str, TParseState *baseState)
while ( (token = Script_GetToken(&str)) != NULL)
{
TParseFunc handler = NULL;
PParseFunc handler = (PParseFunc)0;
TParseState *state;
Script_GetTopState(&stateStack, &state);

17
reaction/game/g_parser.h
View file

@ -15,13 +15,22 @@ typedef struct
void *states[STATE_STACK_SIZE];
} TStateStack;
typedef int (*TParseFunc)(char **tokens, TStateStack *stack);
typedef int (TParseFunc)(char **tokens, TStateStack *stack);
// Makro - this is to shut lcc up :(
#ifndef Q3_VM
typedef TParseFunc *PParseFunc;
#else
#define PParseFunc TParseFunc*
#endif
#define _NULL_T(type) (*(type*)0)
typedef struct _TParseRule
{
const char *keyword;
TParseFunc handler;
PParseFunc handler;
struct _TParseRule *next;
} TParseRule;
@ -45,7 +54,7 @@ TParseState name = {\
#define ADD_RULE(exp, func) {exp, &func, NULL},
#define END_STATE_MARKER {NULL, NULL, NULL}\
#define END_STATE_MARKER {NULL, (TParseFunc*)0, (TParseRule*)NULL}\
}
#define NO_DATA NULL
@ -106,7 +115,7 @@ int Script_GetTopState(const TStateStack *stack, TParseState **state);
int Script_PopState(TStateStack *stack, TParseState **state);
char* Script_GetToken(char **str);
TParseFunc Script_FindHandler(char *token, TParseState *state);
PParseFunc Script_FindHandler(char *token, TParseState *state);
void Script_ParseString(char *str, TParseState *baseState);
#define SCRIPT_PUSH_STATE(state) Script_PushState(SCRIPT_STACK, &state)

11
reaction/ta_ui/ui_shared.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.35 2006/07/24 17:16:12 makro
// Got rid of the warnings lcc liked to share with the world
//
// Revision 1.34 2006/04/14 18:02:06 makro
// no message
//
@ -139,7 +142,7 @@ typedef struct scrollInfo_s {
static scrollInfo_t scrollInfo;
static void (*captureFunc) (void *p) = NULL;
static void (*captureFunc) (void *p) = 0; // NULL;
static void *captureData = NULL;
static itemDef_t *itemCapture = NULL; // item that has the mouse captured ( if any )
@ -3714,7 +3717,7 @@ qboolean Item_HandleKey(itemDef_t * item, int key, qboolean down)
if (itemCapture) {
Item_StopCapture(itemCapture);
itemCapture = NULL;
captureFunc = NULL;
captureFunc = 0;
captureData = NULL;
} else {
// bk001206 - parentheses
@ -7950,7 +7953,7 @@ keywordHash_t itemParseKeywords[] = {
{"hideCvar", ItemParse_hideCvar, NULL},
{"cinematic", ItemParse_cinematic, NULL},
{"doubleclick", ItemParse_doubleClick, NULL},
{NULL, NULL, NULL}
{NULL, 0, NULL}
};
keywordHash_t *itemParseKeywordHash[KEYWORDHASH_SIZE];
@ -8636,7 +8639,7 @@ keywordHash_t menuParseKeywords[] = {
{"fadeClamp", MenuParse_fadeClamp, NULL},
{"fadeCycle", MenuParse_fadeCycle, NULL},
{"fadeAmount", MenuParse_fadeAmount, NULL},
{NULL, NULL, NULL}
{NULL, 0, NULL}
};
keywordHash_t *menuParseKeywordHash[KEYWORDHASH_SIZE];