summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--raetsel.lpi5
-rw-r--r--raetsel.lps71
-rw-r--r--raetselunit.pas45
3 files changed, 69 insertions, 52 deletions
diff --git a/raetsel.lpi b/raetsel.lpi
index 4ed092d..618272c 100644
--- a/raetsel.lpi
+++ b/raetsel.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
- <Version Value="9"/>
+ <Version Value="10"/>
<General>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
@@ -13,9 +13,6 @@
<i18n>
<EnableI18N LFM="False"/>
</i18n>
- <VersionInfo>
- <StringTable ProductVersion=""/>
- </VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>
diff --git a/raetsel.lps b/raetsel.lps
index fc7dde7..3b8bb0d 100644
--- a/raetsel.lps
+++ b/raetsel.lps
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectSession>
- <Version Value="9"/>
+ <Version Value="10"/>
<BuildModes Active="Default"/>
<Units Count="11">
<Unit0>
@@ -18,7 +18,7 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<TopLine Value="21"/>
- <CursorPos X="48" Y="43"/>
+ <CursorPos X="48" Y="40"/>
<UsageCount Value="38"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@@ -41,8 +41,8 @@
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="95"/>
- <CursorPos X="42" Y="120"/>
+ <TopLine Value="218"/>
+ <CursorPos X="30" Y="242"/>
<UsageCount Value="32"/>
<Loaded Value="True"/>
</Unit3>
@@ -93,8 +93,8 @@
<Unit10>
<Filename Value="../units/lowlevelunit.pas"/>
<EditorIndex Value="2"/>
- <TopLine Value="78"/>
- <CursorPos X="10" Y="100"/>
+ <TopLine Value="1187"/>
+ <CursorPos Y="1209"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit10>
@@ -102,121 +102,122 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="raetselunit.pas"/>
- <Caret Line="276" Column="12" TopLine="255"/>
+ <Caret Line="241" TopLine="218"/>
</Position1>
<Position2>
<Filename Value="raetselunit.pas"/>
- <Caret Line="437" Column="97" TopLine="408"/>
+ <Caret Line="243" TopLine="218"/>
</Position2>
<Position3>
<Filename Value="raetselunit.pas"/>
+ <Caret Line="246" TopLine="218"/>
</Position3>
<Position4>
- <Filename Value="unit1.pas"/>
- <Caret Line="61" TopLine="21"/>
+ <Filename Value="raetselunit.pas"/>
+ <Caret Line="247" TopLine="218"/>
</Position4>
<Position5>
<Filename Value="raetselunit.pas"/>
- <Caret Line="27" Column="14" TopLine="5"/>
+ <Caret Line="248" TopLine="218"/>
</Position5>
<Position6>
<Filename Value="raetselunit.pas"/>
- <Caret Line="74" TopLine="34"/>
+ <Caret Line="249" TopLine="218"/>
</Position6>
<Position7>
<Filename Value="raetselunit.pas"/>
- <Caret Line="486" TopLine="392"/>
+ <Caret Line="250" TopLine="218"/>
</Position7>
<Position8>
<Filename Value="raetselunit.pas"/>
- <Caret Line="44" TopLine="43"/>
+ <Caret Line="251" TopLine="218"/>
</Position8>
<Position9>
<Filename Value="raetselunit.pas"/>
- <Caret Line="402" TopLine="377"/>
+ <Caret Line="252" TopLine="218"/>
</Position9>
<Position10>
<Filename Value="raetselunit.pas"/>
- <Caret Line="75" Column="14" TopLine="42"/>
+ <Caret Line="253" TopLine="218"/>
</Position10>
<Position11>
<Filename Value="raetselunit.pas"/>
- <Caret Line="27" Column="21" TopLine="5"/>
+ <Caret Line="254" TopLine="218"/>
</Position11>
<Position12>
<Filename Value="raetselunit.pas"/>
- <Caret Line="66" TopLine="29"/>
+ <Caret Line="255" TopLine="219"/>
</Position12>
<Position13>
<Filename Value="raetselunit.pas"/>
- <Caret Line="75" Column="21" TopLine="39"/>
+ <Caret Line="256" TopLine="220"/>
</Position13>
<Position14>
<Filename Value="raetselunit.pas"/>
- <Caret Line="278" Column="18" TopLine="242"/>
+ <Caret Line="327" TopLine="299"/>
</Position14>
<Position15>
<Filename Value="raetselunit.pas"/>
- <Caret Line="291" Column="15" TopLine="255"/>
+ <Caret Line="328" TopLine="299"/>
</Position15>
<Position16>
<Filename Value="raetselunit.pas"/>
- <Caret Line="39" Column="55" TopLine="19"/>
+ <Caret Line="329" TopLine="299"/>
</Position16>
<Position17>
<Filename Value="raetselunit.pas"/>
- <Caret Line="26" Column="20" TopLine="18"/>
+ <Caret Line="256" TopLine="249"/>
</Position17>
<Position18>
<Filename Value="raetselunit.pas"/>
- <Caret Line="48" Column="20" TopLine="16"/>
+ <Caret Line="329" TopLine="307"/>
</Position18>
<Position19>
<Filename Value="raetselunit.pas"/>
- <Caret Line="146" Column="9" TopLine="110"/>
+ <Caret Line="359" TopLine="349"/>
</Position19>
<Position20>
<Filename Value="raetselunit.pas"/>
- <Caret Line="274" Column="31" TopLine="238"/>
+ <Caret Line="360" TopLine="349"/>
</Position20>
<Position21>
<Filename Value="raetselunit.pas"/>
+ <Caret Line="329" TopLine="223"/>
</Position21>
<Position22>
<Filename Value="raetselunit.pas"/>
- <Caret Line="15" Column="10"/>
+ <Caret Line="57" Column="13" TopLine="35"/>
</Position22>
<Position23>
<Filename Value="raetselunit.pas"/>
- <Caret Line="16" Column="10"/>
+ <Caret Line="230" Column="21" TopLine="221"/>
</Position23>
<Position24>
<Filename Value="raetselunit.pas"/>
- <Caret Line="445" Column="3" TopLine="423"/>
+ <Caret Line="244" Column="15" TopLine="221"/>
</Position24>
<Position25>
<Filename Value="raetselunit.pas"/>
- <Caret Line="83" Column="35" TopLine="47"/>
+ <Caret Line="271" Column="50" TopLine="247"/>
</Position25>
<Position26>
<Filename Value="raetselunit.pas"/>
- <Caret Line="289" Column="3" TopLine="264"/>
+ <Caret Line="323" Column="30" TopLine="293"/>
</Position26>
<Position27>
<Filename Value="raetselunit.pas"/>
- <Caret Line="288" Column="9" TopLine="266"/>
</Position27>
<Position28>
<Filename Value="raetselunit.pas"/>
- <Caret Line="287" Column="10" TopLine="267"/>
+ <Caret Line="57" Column="13" TopLine="21"/>
</Position28>
<Position29>
<Filename Value="raetselunit.pas"/>
- <Caret Line="285" Column="24" TopLine="268"/>
+ <Caret Line="230" Column="21" TopLine="215"/>
</Position29>
<Position30>
<Filename Value="raetselunit.pas"/>
- <Caret Line="114" Column="10" TopLine="95"/>
+ <Caret Line="246" Column="23" TopLine="218"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/raetselunit.pas b/raetselunit.pas
index a2c069e..a5c63d5 100644
--- a/raetselunit.pas
+++ b/raetselunit.pas
@@ -150,6 +150,16 @@ begin
dec(_posi);
end;
+procedure tFelderLoesMeta.aktualisiereInhalt(p: longint);
+begin
+
+end;
+
+procedure tFelderLoesMeta.aktualisiereRand(p: longint);
+begin
+
+end;
+
// tRaetsel ********************************************************************
constructor tRaetsel.create(aOwner: tForm);
@@ -220,18 +230,22 @@ begin
setlength(groeszen,length(spinEdits)-1);
for i:=0 to length(spinEdits)-1 do begin
spinEdits[i]:=tSpinEdit.create(besitzer);
+ if i=1 then
+ groeszen[i-1]:=5
+ else if i>1 then
+ groeszen[i-1]:=1;
with spinEdits[i] do begin
parent:=besitzer;
top:=erzeugeBtn.top+erzeugeBtn.height+spacing;
- if i>0 then
+ if i>0 then begin
left:=spinEdits[i-1].left + spinEdits[i-1].width;
+ value:=groeszen[i-1];
+ end;
left:=left+spacing;
onChange:=@anzSEsOnChange;
onKeyDown:=@self.onKeyDown;
tag:=i;
end;
- if i>0 then
- groeszen[i-1]:=-1;
end;
spinEdits[0].showHint:=true;
spinEdits[0].hint:='Schriftgröße';
@@ -315,8 +329,8 @@ begin
dim:=dim+groeszen[i];
end;
setlength(inhalt,dim*dim);
- setlength(rand,4*dim);
- leeren;
+ setlength(rand,4*(dim+1));
+ loeschen;
cursorPosition:=0;
aktualisiereZeichenflaechenGroesze;
end;
@@ -361,7 +375,7 @@ begin
end;
end;
- p:=permutation(dim*4);
+ p:=permutation((dim+1)*4);
for i:=0 to length(p)-1 do begin
if rand[p[i]]<0 then continue;
w:=rand[p[i]];
@@ -514,7 +528,7 @@ begin
end;
result:=0;
- for
+ //for
if not lm.inhaltBehalten then begin
inhalt[lm.posi]:=-1;
@@ -560,7 +574,7 @@ begin
result:=false;
end;
-function tHochhausRaetsel._loesen(inhaltBehalten: boolean; perm: tLongintArray; posi: longint): longint;
+function tHochhausRaetsel._loesen(lm: tFelderLoesMeta): longint;
begin
end;
@@ -569,8 +583,10 @@ end;
function buchstabenAlphabetFunktion(i: longint): string;
begin
- if i<0 then result:=''
- else if i=0 then result:='-'
+ if i<0 then
+ result:=''
+ else if i=0 then
+ result:='-'
else begin
result:='';
while i>0 do begin
@@ -583,9 +599,12 @@ end;
function zahlenAlphabetFunktion(i: longint): string;
begin
- if i<0 then result:=''
- else if i=0 then result:='-'
- else result:=inttostr(i);
+ if i<0 then
+ result:=''
+ else if i=0 then
+ result:='-'
+ else
+ result:=inttostr(i);
end;
end.