alles in der richtigen Farbe malen

2 files changed, 47 insertions, 41 deletions

diff --git a/raetsel.lps b/raetsel.lps
index 3e553c1..fe60529 100644
--- a/raetsel.lps
+++ b/raetsel.lps
@@ -40,19 +40,17 @@
       <Unit3>
         <Filename Value="raetselunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="515"/>
-        <CursorPos X="10" Y="540"/>
         <UsageCount Value="47"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="raetselunit.inc"/>
         <IsPartOfProject Value="True"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
-        <TopLine Value="677"/>
-        <CursorPos X="32" Y="689"/>
+        <TopLine Value="698"/>
+        <CursorPos X="40" Y="723"/>
         <UsageCount Value="33"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -130,120 +128,120 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="raetselunit.inc"/>
-        <Caret Line="131" TopLine="108"/>
+        <Caret Line="128" TopLine="108"/>
       </Position1>
       <Position2>
         <Filename Value="raetselunit.inc"/>
-        <Caret Line="128" TopLine="108"/>
+        <Caret Line="13" Column="31"/>
       </Position2>
       <Position3>
-        <Filename Value="raetselunit.inc"/>
-        <Caret Line="13" Column="31"/>
+        <Filename Value="raetselunit.pas"/>
+        <Caret Line="346" Column="34" TopLine="344"/>
       </Position3>
       <Position4>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="346" Column="34" TopLine="344"/>
+        <Caret Line="48" Column="27" TopLine="30"/>
       </Position4>
       <Position5>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="48" Column="27" TopLine="30"/>
+        <Caret Line="271" Column="15" TopLine="239"/>
       </Position5>
       <Position6>
-        <Filename Value="raetselunit.pas"/>
-        <Caret Line="271" Column="15" TopLine="239"/>
+        <Filename Value="raetselunit.inc"/>
+        <Caret Line="548" Column="50" TopLine="513"/>
       </Position6>
       <Position7>
         <Filename Value="raetselunit.inc"/>
-        <Caret Line="548" Column="50" TopLine="513"/>
+        <Caret Line="556" Column="21" TopLine="554"/>
       </Position7>
       <Position8>
-        <Filename Value="raetselunit.inc"/>
-        <Caret Line="556" Column="21" TopLine="554"/>
+        <Filename Value="raetselunit.pas"/>
+        <Caret Line="668" Column="22" TopLine="630"/>
       </Position8>
       <Position9>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="668" Column="22" TopLine="630"/>
       </Position9>
       <Position10>
         <Filename Value="raetselunit.pas"/>
+        <Caret Line="48" Column="27" TopLine="15"/>
       </Position10>
       <Position11>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="48" Column="27" TopLine="15"/>
+        <Caret Line="273" Column="4" TopLine="242"/>
       </Position11>
       <Position12>
-        <Filename Value="raetselunit.pas"/>
-        <Caret Line="273" Column="4" TopLine="242"/>
+        <Filename Value="ori_Unit1.pas"/>
+        <Caret Line="76" Column="14" TopLine="44"/>
       </Position12>
       <Position13>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="76" Column="14" TopLine="44"/>
+        <Caret Line="393" Column="21" TopLine="361"/>
       </Position13>
       <Position14>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="393" Column="21" TopLine="361"/>
+        <Caret Line="443" Column="21" TopLine="410"/>
       </Position14>
       <Position15>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="443" Column="21" TopLine="410"/>
+        <Caret Line="474" Column="21" TopLine="466"/>
       </Position15>
       <Position16>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="474" Column="21" TopLine="466"/>
+        <Caret Line="483" Column="13" TopLine="466"/>
       </Position16>
       <Position17>
-        <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="483" Column="13" TopLine="466"/>
+        <Filename Value="raetselunit.pas"/>
+        <Caret Line="65" Column="6" TopLine="37"/>
       </Position17>
       <Position18>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="65" Column="6" TopLine="37"/>
+        <Caret Line="45" Column="31" TopLine="38"/>
       </Position18>
       <Position19>
-        <Filename Value="raetselunit.pas"/>
-        <Caret Line="45" Column="31" TopLine="38"/>
+        <Filename Value="ori_Unit1.pas"/>
+        <Caret Line="574" Column="28" TopLine="541"/>
       </Position19>
       <Position20>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="574" Column="28" TopLine="541"/>
       </Position20>
       <Position21>
         <Filename Value="ori_Unit1.pas"/>
+        <Caret Line="108" Column="31" TopLine="38"/>
       </Position21>
       <Position22>
         <Filename Value="ori_Unit1.pas"/>
-        <Caret Line="108" Column="31" TopLine="38"/>
       </Position22>
       <Position23>
-        <Filename Value="ori_Unit1.pas"/>
-      </Position23>
-      <Position24>
         <Filename Value="raetselunit.pas"/>
         <Caret Line="531" Column="19" TopLine="504"/>
+      </Position23>
+      <Position24>
+        <Filename Value="raetselunit.inc"/>
+        <Caret Line="633" Column="42" TopLine="621"/>
       </Position24>
       <Position25>
         <Filename Value="raetselunit.inc"/>
-        <Caret Line="633" Column="42" TopLine="621"/>
+        <Caret Line="11" Column="39"/>
       </Position25>
       <Position26>
-        <Filename Value="raetselunit.inc"/>
-        <Caret Line="11" Column="39"/>
+        <Filename Value="raetselunit.pas"/>
+        <Caret Line="66" Column="50" TopLine="109"/>
       </Position26>
       <Position27>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="66" Column="50" TopLine="109"/>
+        <Caret Line="67" Column="14" TopLine="47"/>
       </Position27>
       <Position28>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="67" Column="14" TopLine="47"/>
+        <Caret Line="420" Column="22" TopLine="394"/>
       </Position28>
       <Position29>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="420" Column="22" TopLine="394"/>
+        <Caret Line="441" Column="14" TopLine="421"/>
       </Position29>
       <Position30>
         <Filename Value="raetselunit.pas"/>
-        <Caret Line="441" Column="14" TopLine="421"/>
+        <Caret Line="524" Column="20" TopLine="515"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/raetselunit.inc b/raetselunit.inc
index b3eb1c5..634a672 100644
--- a/raetselunit.inc
+++ b/raetselunit.inc
@@ -684,6 +684,10 @@ begin
   if inhalt[cursorPosition]=0 then
     inhalt[cursorPosition]:=-1;
   {$ENDIF}
+  if inhalt[cursorPosition]=-1 then
+    feldFarben[cursorPosition]:=$000000
+  else
+    feldFarben[cursorPosition]:=aktuelleFarbe;
 end;
 {$ENDIF}
 
@@ -698,21 +702,25 @@ begin
   {$IFDEF buchstaben}
   if (key>=ord('A')) and (key<=min(ord('A')+groeszen[0]-1,ord('Z'))) then begin
     inhalt[cursorPosition]:=key-ord('A')+1;
+    feldFarben[cursorPosition]:=aktuelleFarbe;
     exit;
   end;
   if (key in [109,189]) then begin
     inhalt[cursorPosition]:=0;
+    feldFarben[cursorPosition]:=aktuelleFarbe;
     exit;
   end;
   {$ENDIF}
   {$IFDEF hochhaus}
   if (key>=ord('1')) and (key<=min(ord('1')+groeszen[0]-1,ord('9'))) then begin
     inhalt[cursorPosition]:=key-ord('1')+1;
+    feldFarben[cursorPosition]:=aktuelleFarbe;
     exit;
   end;
   {$ENDIF}
   if (key=ord(' ')) or (key=46) or (key=8) then begin
     inhalt[cursorPosition]:=-1;
+    feldFarben[cursorPosition]:=$000000;
     exit;
   end;
   result:=false;