Browse Source

fixed the warning

alex 25 years ago
parent
commit
594855c7cc
2 changed files with 25 additions and 10 deletions
  1. 24 9
      install/demo/fpctris.pp
  2. 1 1
      install/demo/ftrisgr.inc

+ 24 - 9
install/demo/fpctris.pp

@@ -54,8 +54,10 @@ Uses Crt,Dos,
 
 
 CONST TheWidth  = 11; {Watch out, also correct RowMask!}
 CONST TheWidth  = 11; {Watch out, also correct RowMask!}
       TheHeight = 20;
       TheHeight = 20;
+{$IFNDEF UseGraphics}
       PosXField = 10; { Upper X,Y coordinates of playfield}
       PosXField = 10; { Upper X,Y coordinates of playfield}
       PosYField = 3;
       PosYField = 3;
+{$ENDIF}
       MaxFigures= 16; {Maximum # figures place is reserved for.}
       MaxFigures= 16; {Maximum # figures place is reserved for.}
       NrLevels  = 12; {Number of levels currenty defined}
       NrLevels  = 12; {Number of levels currenty defined}
 {      FieldSpace= 177;}
 {      FieldSpace= 177;}
@@ -168,9 +170,13 @@ VAR
     CurrentCol  : LONGINT;                      {Color of current falling piece}
     CurrentCol  : LONGINT;                      {Color of current falling piece}
     UseColor    : BOOLEAN;                      {Color/Mono mode}
     UseColor    : BOOLEAN;                      {Color/Mono mode}
     Level       : LONGINT;                      {The current level number}
     Level       : LONGINT;                      {The current level number}
+{$IFNDEF UseGraphics}
     Style       : String;                       {Contains all chars to create the field}
     Style       : String;                       {Contains all chars to create the field}
+{$ENDIF}
     nonupdatemode  : BOOLEAN;                   {Helpmode/highscore screen or game mode}
     nonupdatemode  : BOOLEAN;                   {Helpmode/highscore screen or game mode}
+{$IFNDEF UseGraphics}
     HelpMode    : BOOLEAN;
     HelpMode    : BOOLEAN;
+{$ENDIF}
     NextFigure  : LONGINT;                      {Next figure to fall}
     NextFigure  : LONGINT;                      {Next figure to fall}
     Score       : LONGINT;                      {The score}
     Score       : LONGINT;                      {The score}
 
 
@@ -517,11 +523,14 @@ END;
 
 
 PROCEDURE FixHighScores;
 PROCEDURE FixHighScores;
 
 
-VAR I,J : LONGINT;
-    S   : String;
+VAR I : LONGINT;
+{$IFNDEF UseGraphics}
+    J : LONGINT;
+{$ENDIF}
+    S : String;
 
 
 BEGIN
 BEGIN
- {$IFDEF UseGraphics}
+{$IFDEF UseGraphics}
   Str(Score:5,S);
   Str(Score:5,S);
   SetFillStyle(SolidFill,0);            {Clear part of playfield}
   SetFillStyle(SolidFill,0);            {Clear part of playfield}
   Bar(DisplGrX+DisplGrScale,DisplGrY + ((TheHeight DIV 2)-2)*DisplGrScale,
   Bar(DisplGrX+DisplGrScale,DisplGrY + ((TheHeight DIV 2)-2)*DisplGrScale,
@@ -530,7 +539,7 @@ BEGIN
   OuttextXY(DisplGrX+DisplGrScale,DisplGrY+ DisplGrScale*((TheHeight DIV 2)-1),'GAME OVER');
   OuttextXY(DisplGrX+DisplGrScale,DisplGrY+ DisplGrScale*((TheHeight DIV 2)-1),'GAME OVER');
   SetTextStyle(0,Horizdir,1);
   SetTextStyle(0,Horizdir,1);
   OutTextXY(DisplGrX+DisplGrScale,DisplGrY+ DisplGrScale*((TheHeight DIV 2)+3),'Score= '+S);
   OutTextXY(DisplGrX+DisplGrScale,DisplGrY+ DisplGrScale*((TheHeight DIV 2)+3),'Score= '+S);
- {$ELSE}
+{$ELSE}
  FOR J:=9 TO 22 DO
  FOR J:=9 TO 22 DO
     BEGIN
     BEGIN
      GotoXY(40,J);
      GotoXY(40,J);
@@ -540,12 +549,14 @@ BEGIN
   TextColor(White);
   TextColor(White);
  GotoXY(40,23);
  GotoXY(40,23);
  Writeln('Game Over, score = ',Score);
  Writeln('Game Over, score = ',Score);
- {$ENDIF}
+{$ENDIF}
  I:=SlipInScore(Score);
  I:=SlipInScore(Score);
  IF I<>0 THEN
  IF I<>0 THEN
   BEGIN
   BEGIN
    NonUpdateMode:=TRUE;
    NonUpdateMode:=TRUE;
+{$IFNDEF UseGraphics}
    HelpMode:=FALSE;
    HelpMode:=FALSE;
+{$ENDIF}
    ShowHighScore;
    ShowHighScore;
    {$IFDEF UseGraphics}
    {$IFDEF UseGraphics}
     OutTextXY(450,HelpY+20+(17-I+1)*LineDistY,S);
     OutTextXY(450,HelpY+20+(17-I+1)*LineDistY,S);
@@ -565,7 +576,7 @@ VAR
 {$ENDIF}
 {$ENDIF}
 
 
 BEGIN
 BEGIN
- {$IFDEF UseGraphics}
+{$IFDEF UseGraphics}
   gm:=vgahi;
   gm:=vgahi;
   gd:=vga;
   gd:=vga;
   InitGraph(gd,gm,'');
   InitGraph(gd,gm,'');
@@ -577,11 +588,13 @@ BEGIN
   SetFillStyle(SolidFill,1);
   SetFillStyle(SolidFill,1);
   GetDefaultPalette(Pal);
   GetDefaultPalette(Pal);
   SetAllPalette(Pal);
   SetAllPalette(Pal);
- {$ENDIF}
+{$ENDIF}
 
 
  {Here should be some terminal-detection for Linux}
  {Here should be some terminal-detection for Linux}
  nonupdatemode:=FALSE;
  nonupdatemode:=FALSE;
+{$IFNDEF UseGraphics}
  HelpMode :=TRUE;
  HelpMode :=TRUE;
+{$ENDIF}
  {$IFDEF Linux}
  {$IFDEF Linux}
   UseColor:=FALSE;
   UseColor:=FALSE;
  {$ELSE}
  {$ELSE}
@@ -593,10 +606,12 @@ BEGIN
  HighX:=BaseX;
  HighX:=BaseX;
  HighY:=BaseY;
  HighY:=BaseY;
  CreateFiguresArray;                  { Load and precalculate a lot of stuff}
  CreateFiguresArray;                  { Load and precalculate a lot of stuff}
+{$IFNDEF UseGraphics}
  IF UseColor THEN
  IF UseColor THEN
   Style:= ColorString
   Style:= ColorString
  ELSE
  ELSE
   Style:=DumbTermStr;
   Style:=DumbTermStr;
+{$ENDIF}
 
 
  NrFigures:=7;                        {Default standard tetris mode, only use
  NrFigures:=7;                        {Default standard tetris mode, only use
                                         the first 7 standard figures}
                                         the first 7 standard figures}
@@ -814,8 +829,8 @@ END.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.6  2000-02-22 03:10:39  alex
-  fixed the warnings
+  Revision 1.7  2000-02-22 03:36:48  alex
+  fixed the warning
 
 
   Revision 1.5  2000/01/21 00:44:51  peter
   Revision 1.5  2000/01/21 00:44:51  peter
     * remove unused vars
     * remove unused vars

+ 1 - 1
install/demo/ftrisgr.inc

@@ -58,7 +58,7 @@ PROCEDURE DisplMainField;
 
 
 VAR Row,Column,Difference,StartRow,EndRow,
 VAR Row,Column,Difference,StartRow,EndRow,
     L : LONGINT;
     L : LONGINT;
-    LastCol : LONGINT;
+{    LastCol : LONGINT; }
 
 
 BEGIN
 BEGIN
  FOR Row:=0 TO TheHeight-1 DO
  FOR Row:=0 TO TheHeight-1 DO