index 0619108abcd45036b8d861e2141e4572a211dae5..37fb2179daa3dea752185bf4504072a0fa296821 100644 (file)
Font[FALSE] := smallfont;
Font[TRUE] := menufont;
Font[FALSE] := smallfont;
Font[TRUE] := menufont;
- MarkerID[FALSE] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/MARKER1');
- MarkerID[TRUE] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/MARKER2');
+ r_Common_SetLoading('GUI', 2 + 9 + 14);
+
+ MarkerID[FALSE] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/MARKER1', [TGLHints.txNoRepeat]);
+ MarkerID[TRUE] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/MARKER2', [TGLHints.txNoRepeat]);
for i := 0 to 8 do
for i := 0 to 8 do
- Box[i] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/BOX' + IntToStr(i + 1));
+ Box[i] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/BOX' + IntToStr(i + 1), []); // !!!
- ScrollLeft := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SLEFT');
- ScrollRight := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SRIGHT');
- ScrollMiddle := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SMIDDLE');
- ScrollMarker := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SMARKER');
+ ScrollLeft := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SLEFT', [TGLHints.txNoRepeat]);
+ ScrollRight := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SRIGHT', [TGLHints.txNoRepeat]);
+ ScrollMiddle := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SMIDDLE', []);
+ ScrollMarker := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SMARKER', [TGLHints.txNoRepeat]);
- EditLeft := r_Textures_LoadFromFile(GameWad + ':TEXTURES/ELEFT');
- EditRight := r_Textures_LoadFromFile(GameWad + ':TEXTURES/ERIGHT');
- EditMiddle := r_Textures_LoadFromFile(GameWad + ':TEXTURES/EMIDDLE');
+ EditLeft := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/ELEFT', [TGLHints.txNoRepeat]);
+ EditRight := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/ERIGHT', [TGLHints.txNoRepeat]);
+ EditMiddle := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/EMIDDLE', []);
- BScrollUp[true] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SCROLLUPA');
- BScrollUp[false] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SCROLLUPU');
- BScrollDown[true] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SCROLLDOWNA');
- BScrollDown[false] := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SCROLLDOWNU');
- BScrollMiddle := r_Textures_LoadFromFile(GameWad + ':TEXTURES/SCROLLMIDDLE');
+ BScrollUp[true] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SCROLLUPA', [TGLHints.txNoRepeat]);
+ BScrollUp[false] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SCROLLUPU', [TGLHints.txNoRepeat]);
+ BScrollDown[true] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SCROLLDOWNA', [TGLHints.txNoRepeat]);
+ BScrollDown[false] := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SCROLLDOWNU', [TGLHints.txNoRepeat]);
+ BScrollMiddle := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/SCROLLMIDDLE', []);
- LogoTex := r_Textures_LoadFromFile(GameWad + ':TEXTURES/MAINLOGO');
- nopic := r_Textures_LoadFromFile(GameWad + ':TEXTURES/NOPIC');
+ LogoTex := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/MAINLOGO', [TGLHints.txNoRepeat]);
+ nopic := r_Common_LoadTextureFromFile(GameWad + ':TEXTURES/NOPIC', [TGLHints.txNoRepeat]);
end;
procedure r_GUI_Free;
end;
procedure r_GUI_Free;
Font[FALSE] := nil;
Font[TRUE] := nil;
Font[FALSE] := nil;
Font[TRUE] := nil;
- MarkerID[FALSE].Free;
- MarkerID[TRUE].Free;
+ r_Common_FreeAndNil(MarkerID[FALSE]);
+ r_Common_FreeAndNil(MarkerID[TRUE]);
for i := 0 to 8 do
for i := 0 to 8 do
- Box[i].Free;
+ r_Common_FreeAndNil(Box[i]);
- ScrollLeft.Free;
- ScrollRight.Free;
- ScrollMiddle.Free;
- ScrollMarker.Free;
+ r_Common_FreeAndNil(ScrollLeft);
+ r_Common_FreeAndNil(ScrollRight);
+ r_Common_FreeAndNil(ScrollMiddle);
+ r_Common_FreeAndNil(ScrollMarker);
- EditLeft.Free;
- EditRight.Free;
- EditMiddle.Free;
+ r_Common_FreeAndNil(EditLeft);
+ r_Common_FreeAndNil(EditRight);
+ r_Common_FreeAndNil(EditMiddle);
- BScrollUp[true].Free;
- BScrollUp[false].Free;
- BScrollDown[true].Free;
- BScrollDown[false].Free;
- BScrollMiddle.Free;
+ r_Common_FreeAndNil(BScrollUp[true]);
+ r_Common_FreeAndNil(BScrollUp[false]);
+ r_Common_FreeAndNil(BScrollDown[true]);
+ r_Common_FreeAndNil(BScrollDown[false]);
+ r_Common_FreeAndNil(BScrollMiddle);
- LogoTex.Free;
- nopic.Free;
+ r_Common_FreeAndNil(LogoTex);
+ r_Common_FreeAndNil(nopic);
r_Common_FreeThis(Background);
r_Common_FreeThis(ImageControl);
r_Common_FreeThis(Background);
r_Common_FreeThis(ImageControl);