lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'public_next' into master

Browse source
This commit is contained in:
Alam Ed Arias 2015-09-03 13:55:29 -04:00
parent 7092a24acd 04c1a507ba
commit eb4de823e9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lua_script.c
View file

@ -737,7 +737,7 @@ static int NetArchive(lua_State *L)
{ {
int TABLESINDEX = lua_upvalueindex(1); int TABLESINDEX = lua_upvalueindex(1);
int i, n = lua_gettop(L); int i, n = lua_gettop(L);
for (i = 0; i < n; i++) for (i = 1; i <= n; i++)
ArchiveValue(TABLESINDEX, i); ArchiveValue(TABLESINDEX, i);
return n; return n;
} }
@ -884,7 +884,7 @@ static int NetUnArchive(lua_State *L)
{ {
int TABLESINDEX = lua_upvalueindex(1); int TABLESINDEX = lua_upvalueindex(1);
int i, n = lua_gettop(L); int i, n = lua_gettop(L);
for (i = 0; i < n; i++) for (i = 1; i <= n; i++)
UnArchiveValue(TABLESINDEX); UnArchiveValue(TABLESINDEX);
return n; return n;
} }

3
src/m_menu.c
View file

@ -2203,6 +2203,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
currentMenu = &OP_SoundOptionsDef; currentMenu = &OP_SoundOptionsDef;
itemOn = 0; itemOn = 0;
return true; return true;
@ -2212,6 +2213,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
M_VideoModeMenu(0); M_VideoModeMenu(0);
return true; return true;
#endif #endif
@ -2223,6 +2225,7 @@ boolean M_Responder(event_t *ev)
if (modeattacking) if (modeattacking)
return true; return true;
M_StartControlPanel(); M_StartControlPanel();
M_Options(0);
M_SetupNextMenu(&OP_MainDef); M_SetupNextMenu(&OP_MainDef);
return true; return true;