* Merge unified-sdl to trunk

* Bump Q3_VERSION to 1.35
This commit is contained in:
Tim Angus 2007-09-05 18:17:46 +00:00
parent 39abffeb3b
commit 672cfbf16f
188 changed files with 5071 additions and 41739 deletions

View file

@ -204,7 +204,7 @@ typedef struct {
int cvarFlags;
} cvarTable_t;
static cvarTable_t cvarTable[] = { // bk001129
static cvarTable_t cvarTable[] = {
{ &cg_ignore, "cg_ignore", "0", 0 }, // used for debugging
{ &cg_autoswitch, "cg_autoswitch", "1", CVAR_ARCHIVE },
{ &cg_drawGun, "cg_drawGun", "1", CVAR_ARCHIVE },
@ -1357,7 +1357,7 @@ qboolean CG_Asset_Parse(int handle) {
continue;
}
}
return qfalse; // bk001204 - why not?
return qfalse;
}
void CG_ParseMenu(const char *menuFile) {
@ -1690,7 +1690,7 @@ static void CG_FeederSelection(float feederID, int index) {
}
#endif
#ifdef MISSIONPACK // bk001204 - only needed there
#ifdef MISSIONPACK
static float CG_Cvar_Get(const char *cvar) {
char buff[128];
memset(buff, 0, sizeof(buff));