eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix emscripten build

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5821 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-04-19 19:17:14 +00:00
parent d14bd740d9
commit 2ccae3b1cf
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/client/m_options.c
View file

@ -4071,21 +4071,19 @@ static qboolean M_ModelViewerKey(struct menucustom_s *c, struct emenu_s *m, int
return true; return true;
} }
#ifdef RAGDOLL
void M_Modelviewer_Reset(struct menu_s *cmenu) void M_Modelviewer_Reset(struct menu_s *cmenu)
{ {
emenu_t *menu = (emenu_t*)cmenu; emenu_t *menu = (emenu_t*)cmenu;
modelview_t *mv = menu->data; modelview_t *mv = menu->data;
mv->ragworld.worldmodel = NULL; //already went away mv->ragworld.worldmodel = NULL; //already went away
#ifdef RAGDOLL
rag_removedeltaent(&mv->ragent); rag_removedeltaent(&mv->ragent);
skel_reset(&mv->ragworld); skel_reset(&mv->ragworld);
World_RBE_Shutdown(&mv->ragworld); World_RBE_Shutdown(&mv->ragworld);
#endif
//we still want it. //we still want it.
mv->ragworld.worldmodel = NULL;//Mod_ForName("", MLV_SILENT); mv->ragworld.worldmodel = NULL;//Mod_ForName("", MLV_SILENT);
// World_RBE_Start(&mv->ragworld); // World_RBE_Start(&mv->ragworld);
} }
#ifdef RAGDOLL
static void M_Modelviewer_Shutdown(struct emenu_s *menu) static void M_Modelviewer_Shutdown(struct emenu_s *menu)
{ {
modelview_t *mv = menu->data; modelview_t *mv = menu->data;
@ -4112,7 +4110,6 @@ void M_Menu_ModelViewer_f(void)
menu = M_CreateMenu(sizeof(*mv)); menu = M_CreateMenu(sizeof(*mv));
menu->menu.persist = true; menu->menu.persist = true;
menu->menu.videoreset = M_Modelviewer_Reset;
mv = menu->data; mv = menu->data;
c = MC_AddCustom(menu, 64, 32, mv, 0, NULL); c = MC_AddCustom(menu, 64, 32, mv, 0, NULL);
menu->cursoritem = (menuoption_t*)c; menu->cursoritem = (menuoption_t*)c;
@ -4127,6 +4124,7 @@ void M_Menu_ModelViewer_f(void)
mv->framechangetime = realtime; mv->framechangetime = realtime;
mv->skinchangetime = realtime; mv->skinchangetime = realtime;
#ifdef RAGDOLL #ifdef RAGDOLL
menu->menu.videoreset = M_Modelviewer_Reset;
menu->remove = M_Modelviewer_Shutdown; menu->remove = M_Modelviewer_Shutdown;
mv->ragworld.progs = &mv->ragfuncs; mv->ragworld.progs = &mv->ragfuncs;
mv->ragfuncs.AddString = M_Modelviewer_AddString; mv->ragfuncs.AddString = M_Modelviewer_AddString;