mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix compile errors
This commit is contained in:
Sally Coolatta
parent
9b6aa946ea
commit
ddf466d61f
6 changed files with 5 additions and 116 deletions
|
|
@ -1468,7 +1468,7 @@ void CONS_Printf(const char *fmt, ...)
|
|||
if (con_started)
|
||||
CON_Print(txt);
|
||||
|
||||
CON_LogMessage(txt);
|
||||
CON_LogMessage(txt);
|
||||
|
||||
Lock_state();
|
||||
|
||||
|
|
|
|||
|
|
@ -2054,52 +2054,6 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
|
|||
M_SortServerList();
|
||||
}
|
||||
|
||||
#if defined (MASTERSERVER) && defined (HAVE_THREADS)
|
||||
struct Fetch_servers_ctx
|
||||
{
|
||||
int id;
|
||||
};
|
||||
|
||||
static void
|
||||
Fetch_servers_thread (struct Fetch_servers_ctx *ctx)
|
||||
{
|
||||
msg_server_t *server_list;
|
||||
|
||||
server_list = GetShortServersList(ctx->id);
|
||||
|
||||
if (server_list)
|
||||
{
|
||||
I_lock_mutex(&ms_QueryId_mutex);
|
||||
{
|
||||
if (ctx->id != ms_QueryId)
|
||||
{
|
||||
free(server_list);
|
||||
server_list = NULL;
|
||||
}
|
||||
}
|
||||
I_unlock_mutex(ms_QueryId_mutex);
|
||||
|
||||
if (server_list)
|
||||
{
|
||||
I_lock_mutex(&m_menu_mutex);
|
||||
{
|
||||
if (m_waiting_mode == M_WAITING_SERVERS)
|
||||
m_waiting_mode = M_NOT_WAITING;
|
||||
}
|
||||
I_unlock_mutex(m_menu_mutex);
|
||||
|
||||
I_lock_mutex(&ms_ServerList_mutex);
|
||||
{
|
||||
ms_ServerList = server_list;
|
||||
}
|
||||
I_unlock_mutex(ms_ServerList_mutex);
|
||||
}
|
||||
}
|
||||
|
||||
free(ctx);
|
||||
}
|
||||
#endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/
|
||||
|
||||
void CL_QueryServerList (msg_server_t *server_list)
|
||||
{
|
||||
INT32 i;
|
||||
|
|
|
|||
|
|
@ -1182,12 +1182,9 @@ void Command_ObjectPlace_f(void)
|
|||
{
|
||||
objectplacing = true;
|
||||
|
||||
if (players[0].powers[pw_carry] == CR_NIGHTSMODE)
|
||||
return;
|
||||
|
||||
if (!COM_CheckParm("-silent"))
|
||||
{
|
||||
HU_SetCEchoFlags(V_RETURN8|V_MONOSPACE|V_AUTOFADEOUT);
|
||||
HU_SetCEchoFlags(V_RETURN8|V_MONOSPACE);
|
||||
HU_SetCEchoDuration(10);
|
||||
HU_DoCEcho(va(M_GetText(
|
||||
"\\\\\\\\\\\\\\\\\\\\\\\\\x82"
|
||||
|
|
|
|||
62
src/m_menu.c
62
src/m_menu.c
|
|
@ -408,9 +408,6 @@ static void M_HandleMonitorToggles(INT32 choice);
|
|||
|
||||
// Consvar onchange functions
|
||||
static void Newgametype_OnChange(void);
|
||||
#ifdef HWRENDER
|
||||
static void Newrenderer_OnChange(void);
|
||||
#endif
|
||||
static void Dummymenuplayer_OnChange(void);
|
||||
//static void Dummymares_OnChange(void);
|
||||
static void Dummystaff_OnChange(void);
|
||||
|
|
@ -437,11 +434,6 @@ CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
|
|||
|
||||
consvar_t cv_newgametype = {"newgametype", "Race", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
#ifdef HWRENDER
|
||||
consvar_t cv_newrenderer = {"newrenderer", "Software", CV_HIDEN|CV_CALL, cv_renderer_t, Newrenderer_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
//static int newrenderer_set = 1;/* Software doesn't need confirmation! */
|
||||
#endif
|
||||
|
||||
static CV_PossibleValue_t serversort_cons_t[] = {
|
||||
{0,"Ping"},
|
||||
{1,"Modified State"},
|
||||
|
|
@ -1264,7 +1256,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
|
|||
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20},
|
||||
#endif
|
||||
#ifdef HWRENDER
|
||||
{IT_STRING | IT_CVAR, NULL, "Renderer", &cv_newrenderer, 30},
|
||||
{IT_STRING | IT_CVAR, NULL, "Renderer", &cv_renderer, 30},
|
||||
#else
|
||||
{IT_TRANSTEXT | IT_PAIR, "Renderer", "Software", &cv_renderer, 30},
|
||||
#endif
|
||||
|
|
@ -2273,58 +2265,6 @@ static void Newgametype_OnChange(void)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef HWRENDER
|
||||
|
||||
#if 0
|
||||
static void Newrenderer_AREYOUSURE(INT32 c)
|
||||
{
|
||||
int n;
|
||||
switch (c)
|
||||
{
|
||||
case 'y':
|
||||
case KEY_ENTER:
|
||||
n = cv_newrenderer.value;
|
||||
newrenderer_set |= n;
|
||||
CV_SetValue(&cv_renderer, n);
|
||||
break;
|
||||
default:
|
||||
CV_StealthSetValue(&cv_newrenderer, cv_renderer.value);
|
||||
}
|
||||
}
|
||||
|
||||
static void Newrenderer_OnChange(void)
|
||||
{
|
||||
/* Well this works for now because there's only two options. */
|
||||
int n;
|
||||
n = cv_newrenderer.value;
|
||||
newrenderer_set |= cv_renderer.value;
|
||||
if (( newrenderer_set & n ))
|
||||
CV_SetValue(&cv_renderer, n);
|
||||
else
|
||||
{
|
||||
M_StartMessage(
|
||||
"The OpenGL renderer is incomplete.\n"
|
||||
"Some visuals may fail to appear, or\n"
|
||||
"appear incorrectly.\n"
|
||||
"Do you still want to switch to it?\n"
|
||||
"\n"
|
||||
"(Press 'y' or 'n')",
|
||||
Newrenderer_AREYOUSURE, MM_YESNO
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static void Newrenderer_OnChange(void)
|
||||
{
|
||||
CV_SetValue(&cv_renderer, cv_newrenderer.value); // SRB2Kart: don't want the warning
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif/*HWRENDER*/
|
||||
|
||||
void Screenshot_option_Onchange(void)
|
||||
{
|
||||
OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
|
||||
|
|
|
|||
|
|
@ -4489,9 +4489,9 @@ void P_PlayerThink(player_t *player)
|
|||
|
||||
// check for use
|
||||
if (cmd->buttons & BT_BRAKE)
|
||||
player->pflags |= PF_USEDOWN;
|
||||
player->pflags |= PF_SPINDOWN;
|
||||
else
|
||||
player->pflags &= ~PF_USEDOWN;
|
||||
player->pflags &= ~PF_SPINDOWN;
|
||||
|
||||
// IF PLAYER NOT HERE THEN FLASH END IF
|
||||
if (player->quittime && player->powers[pw_flashing] < flashingtics - 1 && !player->gotflag)
|
||||
|
|
|
|||
|
|
@ -760,8 +760,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
|
|||
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename);
|
||||
if (important)
|
||||
packetsizetally -= nameonlylength(filename) + 22;
|
||||
if (handle)
|
||||
fclose(handle);
|
||||
return W_InitFileError(filename, false);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue