nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-22 20:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4765 fc73d0e0-1445-4013-8a0c-d673dee63da5

Browse source
This commit is contained in:
Spoike 2014-10-11 22:16:40 +00:00
parent 97579ebfbb
commit 3284a25b59
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_ents.c
View file

@ -3471,7 +3471,9 @@ void CL_LinkPacketEntities (void)
else if (state->colormap > 0 && state->colormap <= cl.allocated_client_slots) else if (state->colormap > 0 && state->colormap <= cl.allocated_client_slots)
{ {
ent->playerindex = state->colormap-1; ent->playerindex = state->colormap-1;
#ifdef HEXEN2
ent->h2playerclass = cl.players[ent->playerindex].h2playerclass; ent->h2playerclass = cl.players[ent->playerindex].h2playerclass;
#endif
ent->topcolour = cl.players[ent->playerindex].ttopcolor; ent->topcolour = cl.players[ent->playerindex].ttopcolor;
ent->bottomcolour = cl.players[ent->playerindex].tbottomcolor; ent->bottomcolour = cl.players[ent->playerindex].tbottomcolor;
} }

7
engine/client/m_items.c
View file

@ -374,8 +374,10 @@ static qboolean MI_Selectable(menuoption_t *op)
return false; return false;
case mt_button: case mt_button:
return true; return true;
#ifdef HEXEN2
case mt_hexen2buttonbigfont: case mt_hexen2buttonbigfont:
return true; return true;
#endif
case mt_qbuttonbigfont: case mt_qbuttonbigfont:
return true; return true;
case mt_menudot: case mt_menudot:
@ -500,9 +502,11 @@ static void MenuDrawItems(int xpos, int ypos, menuoption_t *option, menu_t *menu
case mt_button: case mt_button:
Draw_FunStringWidth(xpos + option->common.posx, ypos+option->common.posy, option->button.text, option->common.width, true, !menu->cursoritem && menu->selecteditem == option); Draw_FunStringWidth(xpos + option->common.posx, ypos+option->common.posy, option->button.text, option->common.width, true, !menu->cursoritem && menu->selecteditem == option);
break; break;
#ifdef HEXEN2
case mt_hexen2buttonbigfont: case mt_hexen2buttonbigfont:
Draw_Hexen2BigFontString(xpos+option->common.posx, ypos+option->common.posy, option->button.text); Draw_Hexen2BigFontString(xpos+option->common.posx, ypos+option->common.posy, option->button.text);
break; break;
#endif
case mt_qbuttonbigfont: case mt_qbuttonbigfont:
Draw_BigFontString(xpos+option->common.posx, ypos+option->common.posy, option->button.text); Draw_BigFontString(xpos+option->common.posx, ypos+option->common.posy, option->button.text);
break; break;
@ -1329,6 +1333,7 @@ menubutton_t *MC_AddConsoleCommandQBigFont(menu_t *menu, int x, int y, const cha
menu->options = (menuoption_t *)n; menu->options = (menuoption_t *)n;
return n; return n;
} }
#ifdef HEXEN2
menubutton_t *MC_AddConsoleCommandHexen2BigFont(menu_t *menu, int x, int y, const char *text, const char *command) menubutton_t *MC_AddConsoleCommandHexen2BigFont(menu_t *menu, int x, int y, const char *text, const char *command)
{ {
menubutton_t *n = Z_Malloc(sizeof(menubutton_t)+strlen(text)+1+strlen(command)+1); menubutton_t *n = Z_Malloc(sizeof(menubutton_t)+strlen(text)+1+strlen(command)+1);
@ -1347,7 +1352,7 @@ menubutton_t *MC_AddConsoleCommandHexen2BigFont(menu_t *menu, int x, int y, cons
menu->options = (menuoption_t *)n; menu->options = (menuoption_t *)n;
return n; return n;
} }
#endif
menubutton_t *MC_AddCommand(menu_t *menu, int lhs, int rhs, int y, char *text, qboolean (*command) (union menuoption_s *,struct menu_s *,int)) menubutton_t *MC_AddCommand(menu_t *menu, int lhs, int rhs, int y, char *text, qboolean (*command) (union menuoption_s *,struct menu_s *,int))
{ {
menubutton_t *n = Z_Malloc(sizeof(menubutton_t)); menubutton_t *n = Z_Malloc(sizeof(menubutton_t));

2
engine/client/sys_win.c
View file

@ -3258,7 +3258,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
return 0; return 0;
} }
/*
GetModuleFileName(NULL, cwd, sizeof(cwd)-1); GetModuleFileName(NULL, cwd, sizeof(cwd)-1);
for (e = cwd+strlen(cwd)-1; e >= cwd; e--) for (e = cwd+strlen(cwd)-1; e >= cwd; e--)
{ {
@ -3268,7 +3267,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
break; break;
} }
} }
*/
} }
} }