Compare commits

..

No commits in common. "d92d2c03c494f7ace6e85fcdf7bba6b56737dca6" and "0300692cdd1069952914ea00c226f5e7e7f34eca" have entirely different histories.

View File

@ -55,50 +55,6 @@ watchPlayers()
}
}
destroyFixed()
{
if ( !isdefined( self ) )
{
return;
}
self destroy();
}
removeChildFixed( element )
{
temp = [];
for ( i = 0; i < self.children.size ; i++ )
{
if ( isdefined( self.children[ i ] ) && self.children[ i ] != element )
{
self.children[ i ].index = temp.size;
temp[ temp.size ] = self.children[ i ];
}
}
self.children = temp;
element.index = undefined;
element.parent = undefined;
}
destroyElemFixed()
{
if ( !isdefined( self ) )
{
return;
}
if ( isdefined( self.parent ) )
{
self.parent removeChildFixed( self );
}
self destroyelem();
}
kill_menu()
{
self notify( "bots_kill_menu" );
@ -110,6 +66,7 @@ init_menu()
self.menuinit = true;
self.menuopen = false;
self.menu_player = undefined;
self.submenu = "Main";
self.curs[ "Main" ][ "X" ] = 0;
self addOptions();
@ -138,7 +95,7 @@ watchDisconnect()
{
if ( isdefined( self.menutexty[ i ] ) )
{
self.menutexty[ i ] destroyElemFixed();
self.menutexty[ i ] destroy();
}
}
}
@ -149,7 +106,7 @@ watchDisconnect()
{
if ( isdefined( self.menutext[ i ] ) )
{
self.menutext[ i ] destroyElemFixed();
self.menutext[ i ] destroy();
}
}
}
@ -158,18 +115,18 @@ watchDisconnect()
{
if ( isdefined( self.menu[ "X" ][ "Shader" ] ) )
{
self.menu[ "X" ][ "Shader" ] destroyElemFixed();
self.menu[ "X" ][ "Shader" ] destroy();
}
if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) )
{
self.menu[ "X" ][ "Scroller" ] destroyElemFixed();
self.menu[ "X" ][ "Scroller" ] destroy();
}
}
if ( isdefined( self.menuversionhud ) )
{
self.menuversionhud destroyFixed();
self.menuversionhud destroy();
}
}
}
@ -375,7 +332,7 @@ OpenSub( menu, menu2 )
{
if ( isdefined( self.menutext[ i ] ) )
{
self.menutext[ i ] destroyElemFixed();
self.menutext[ i ] destroy();
}
}
}
@ -384,18 +341,18 @@ OpenSub( menu, menu2 )
{
if ( isdefined( self.menu[ "X" ][ "Shader" ] ) )
{
self.menu[ "X" ][ "Shader" ] destroyElemFixed();
self.menu[ "X" ][ "Shader" ] destroy();
}
if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) )
{
self.menu[ "X" ][ "Scroller" ] destroyElemFixed();
self.menu[ "X" ][ "Scroller" ] destroy();
}
}
if ( isdefined( self.menuversionhud ) )
{
self.menuversionhud destroyFixed();
self.menuversionhud destroy();
}
for ( i = 0 ; i < self.option[ "Name" ][ self.submenu ].size ; i++ )
@ -445,7 +402,7 @@ OpenSub( menu, menu2 )
{
if ( isdefined( self.menutexty[ i ] ) )
{
self.menutexty[ i ] destroyElemFixed();
self.menutexty[ i ] destroy();
}
}
}
@ -469,11 +426,11 @@ CursMove( direction )
if ( self.submenu == "Main" )
{
self.menu[ "X" ][ "Scroller" ].x = self.menutext[ self.curs[ "Main" ][ "X" ] ].x;
self.menu[ "X" ][ "Scroller" ].y = self.menutext[ self.curs[ "Main" ][ "X" ] ].y;
if ( isdefined( self.menutext ) )
{
self.menu[ "X" ][ "Scroller" ].x = self.menutext[ self.curs[ "Main" ][ "X" ] ].x;
self.menu[ "X" ][ "Scroller" ].y = self.menutext[ self.curs[ "Main" ][ "X" ] ].y;
for ( i = 0; i < self.menutext.size; i++ )
{
if ( isdefined( self.menutext[ i ] ) )
@ -621,7 +578,7 @@ ExitSub()
{
if ( isdefined( self.menutexty[ i ] ) )
{
self.menutexty[ i ] destroyElemFixed();
self.menutexty[ i ] destroy();
}
}
}
@ -646,7 +603,7 @@ ExitMenu()
{
if ( isdefined( self.menutext[ i ] ) )
{
self.menutext[ i ] destroyElemFixed();
self.menutext[ i ] destroy();
}
}
}
@ -655,18 +612,18 @@ ExitMenu()
{
if ( isdefined( self.menu[ "X" ][ "Shader" ] ) )
{
self.menu[ "X" ][ "Shader" ] destroyElemFixed();
self.menu[ "X" ][ "Shader" ] destroy();
}
if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) )
{
self.menu[ "X" ][ "Scroller" ] destroyElemFixed();
self.menu[ "X" ][ "Scroller" ] destroy();
}
}
if ( isdefined( self.menuversionhud ) )
{
self.menuversionhud destroyFixed();
self.menuversionhud destroy();
}
self.menuopen = false;