aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Menu/UMenu.pas
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-04 07:08:11 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-04 07:08:11 +0000
commit5d8cb78bc5b8187da6e80954124f076c408b3c34 (patch)
tree6c31a05725b8832ddfb978101d49f9c718e9de2c /Game/Code/Menu/UMenu.pas
parent1d1b3b37b1aa462c33be8124a1947b8ea237c73b (diff)
downloadusdx-5d8cb78bc5b8187da6e80954124f076c408b3c34.tar.gz
usdx-5d8cb78bc5b8187da6e80954124f076c408b3c34.tar.xz
usdx-5d8cb78bc5b8187da6e80954124f076c408b3c34.zip
Patchs from AlexanderS & f1fth_freed0m
also some minor bug fixes from myself. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@904 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Menu/UMenu.pas')
-rw-r--r--Game/Code/Menu/UMenu.pas14
1 files changed, 3 insertions, 11 deletions
diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas
index 8b7bfff3..69ecda44 100644
--- a/Game/Code/Menu/UMenu.pas
+++ b/Game/Code/Menu/UMenu.pas
@@ -894,11 +894,8 @@ begin
Int := (Int + 1) Mod Length(Interactions);
//If no Interaction is Selectable Simply Select Next
- if (Int = Interaction) then
- begin
- Int := (Int + 1) Mod Length(Interactions);
- Break;
- end;
+ if (Int = Interaction) then Break;
+
Until IsSelectable(Int);
//Set Interaction
@@ -918,12 +915,7 @@ begin
if Int = -1 then Int := High(Interactions);
//If no Interaction is Selectable Simply Select Next
- if (Int = Interaction) then
- begin
- Int := SelInteraction - 1;
- if Int = -1 then Int := High(Interactions);
- Break;
- end;
+ if (Int = Interaction) then Break;
Until IsSelectable(Int);
//Set Interaction