samples: Fixed more discovered syntax errors

diff --git a/samples/3D/spriteBalls/balls.ec b/samples/3D/spriteBalls/balls.ec
index af754b7..b23b780 100644 (file)
--- a/samples/3D/spriteBalls/balls.ec
+++ b/samples/3D/spriteBalls/balls.ec
@@ -74,7 +74,7 @@ static ColorAlpha palette[256] =
    0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,
-   0xFF343973, 0xFF463971, 0xFF553870, 0xFF5F386F, 0xFF6F3872, 0xFF6F3860, 0,0,
+   0xFF343973, 0xFF463971, 0xFF553870, 0xFF5F386F, 0xFF6F3872, 0xFF6F3860, 0,0
 };
 
 static void ScaleCenterBit(Surface surface, int sx,int sy,int sizex,int sizey, Bitmap bitmap)

diff --git a/samples/games/cards/ruff/src/trump.ec b/samples/games/cards/ruff/src/trump.ec
index d158bb4..d6deb1c 100644 (file)
--- a/samples/games/cards/ruff/src/trump.ec
+++ b/samples/games/cards/ruff/src/trump.ec
@@ -20,7 +20,7 @@ class Trump : Kind
       Bitmap icon = (this != none) ? trumpDialog.icons[this].bitmap : null;
       char name[10];
       int w, h;
-      int xStart = icon ? (icon.width + 8) : ((trumpDialog.icons[0].bitmap ? trumpDialog.icons[0].bitmap.width : 0) + 8;
+      int xStart = icon ? (icon.width + 8) : ((trumpDialog.icons[0].bitmap ? trumpDialog.icons[0].bitmap.width : 0) + 8);
       int len;
 
       OnGetString(name, trumpDialog, null);

diff --git a/samples/games/cornerBlocks/cornerBlocks.ec b/samples/games/cornerBlocks/cornerBlocks.ec
index 4cc635d..a520507 100644 (file)
--- a/samples/games/cornerBlocks/cornerBlocks.ec
+++ b/samples/games/cornerBlocks/cornerBlocks.ec
@@ -95,7 +95,7 @@ Piece pieces[numPieces] =
          1,
          1
       }
-   }
+   },
    {
       2,3,
       {

diff --git a/samples/guiAndGfx/DataControls/DataControls.ec b/samples/guiAndGfx/DataControls/DataControls.ec
index 00e7bdd..6a9cdf3 100644 (file)
--- a/samples/guiAndGfx/DataControls/DataControls.ec
+++ b/samples/guiAndGfx/DataControls/DataControls.ec
@@ -12,8 +12,8 @@ class Form1 : Window
 
    ListBox listBox1 { this, text = "listBox1", size = { 108, 132 }, position = { 144, 88 } };
 
-   DataField field1 { dataType = "int", editable = false, alignment = center, width = 40, header = "MyInt1" };
-   DataField field2 { dataType = "int", editable = false, alignment = center, width = 40, header = "MyInt2" };
+   DataField field1 { dataType = class(int), editable = false, alignment = center, width = 40, header = "MyInt1" };
+   DataField field2 { dataType = class(int), editable = false, alignment = center, width = 40, header = "MyInt2" };
 
    Form1()
    {

diff --git a/samples/guiAndGfx/disablingMovingControls/form2.ec b/samples/guiAndGfx/disablingMovingControls/form2.ec
index 04dcee2..e437b31 100644 (file)
--- a/samples/guiAndGfx/disablingMovingControls/form2.ec
+++ b/samples/guiAndGfx/disablingMovingControls/form2.ec
@@ -102,7 +102,7 @@ class Form2 : Window
          }
          return true;
       }
-   }
+   };
 
    uint counter0, counter1;
    Button button5

diff --git a/samples/guiAndGfx/eNotepad/eNotepad.ec b/samples/guiAndGfx/eNotepad/eNotepad.ec
index 4413616..9928e11 100644 (file)
--- a/samples/guiAndGfx/eNotepad/eNotepad.ec
+++ b/samples/guiAndGfx/eNotepad/eNotepad.ec
@@ -7,7 +7,7 @@ static FileFilter txtFilters[] =
 };
 static FileType txtTypes[] =
 {
-   { "Text Files", "txt", always },
+   { "Text Files", "txt", always }
 };
 
 eNotepad app;
@@ -43,7 +43,7 @@ class eNodepadWindow : Window
             }
          }
       }
-   }
+   };
    MenuDivider { fileMenu };
    MenuItem saveItem { fileMenu, "Save", s, ctrlS, NotifySelect = MenuFileSave };
    MenuItem saveItemAs { fileMenu, "Save As...", a, NotifySelect = MenuFileSaveAs };

diff --git a/samples/guiAndGfx/openrider/form1.ec b/samples/guiAndGfx/openrider/form1.ec
index 8429c70..1f607f3 100644 (file)
--- a/samples/guiAndGfx/openrider/form1.ec
+++ b/samples/guiAndGfx/openrider/form1.ec
@@ -139,7 +139,7 @@ struct Camera2D {
 static FileFilter fileFilters[] =
 {
    { "OpenRider track files (*.ort)", "ort" },
-   { "All files", null},
+   { "All files", null}
 };
 
 static FileType fileTypes[] =
@@ -257,7 +257,7 @@ class Form1 : Window
             Update(null);
             return true;
          }
-      }
+      };
    MenuItem fileOpenItem {
          fileMenu, "Open...", o, Key {o, ctrl = true};
 
@@ -273,9 +273,9 @@ class Form1 : Window
             }
             return true;
          }
-      }
-   MenuItem fileSaveItem { fileMenu, "Save", s, Key {s, ctrl = true}, NotifySelect=MenuFileSave}
-   MenuItem fileSaveAsItem { fileMenu, "Save As...", a, Key {a, ctrl = true}, NotifySelect=MenuFileSaveAs }
+      };
+   MenuItem fileSaveItem { fileMenu, "Save", s, Key {s, ctrl = true}, NotifySelect=MenuFileSave};
+   MenuItem fileSaveAsItem { fileMenu, "Save As...", a, Key {a, ctrl = true}, NotifySelect=MenuFileSaveAs };
    MenuDivider {fileMenu};
    MenuItem exitItem {fileMenu, "Exit", x, altF4, NotifySelect = MenuFileExit };
 
@@ -289,25 +289,25 @@ class Form1 : Window
          }
          return true;
       }
-   }
+   };
    MenuDivider {viewMenu};
    MenuItem zoomInItem {viewMenu, "Zoom in\t+", i;
       bool NotifySelect(MenuItem selection, Modifiers mods) {
          Zoom(1.5, 0);
          return true;
       }
-   }
+   };
    MenuItem zoomOutItem {viewMenu, "Zoom out\t-", o;
       bool NotifySelect(MenuItem selection, Modifiers mods) {
          Zoom(1/1.5, 0);
          return true;
       }
-   }
+   };
    MenuDivider {viewMenu};
-   MenuItem nudgeLeftItem {viewMenu, "Left", l, left, NotifySelect = NudgeCallback, id=0}
-   MenuItem nudgeRightItem {viewMenu, "Right", r, right, NotifySelect = NudgeCallback, id=1}
-   MenuItem nudgeUpItem {viewMenu, "Up", u, up, NotifySelect = NudgeCallback, id=2}
-   MenuItem nudgeDownItem {viewMenu, "Down", d, down, NotifySelect = NudgeCallback, id=3}
+   MenuItem nudgeLeftItem {viewMenu, "Left", l, left, NotifySelect = NudgeCallback, id=0};
+   MenuItem nudgeRightItem {viewMenu, "Right", r, right, NotifySelect = NudgeCallback, id=1};
+   MenuItem nudgeUpItem {viewMenu, "Up", u, up, NotifySelect = NudgeCallback, id=2};
+   MenuItem nudgeDownItem {viewMenu, "Down", d, down, NotifySelect = NudgeCallback, id=3};
 
    bool NudgeCallback(MenuItem selection, Modifiers mods) {
       Camera2D *c = camera;
@@ -348,7 +348,7 @@ class Form1 : Window
          running = selection.checked;
          return true;
       }
-   }
+   };
    MenuItem resetItem {controlMenu, "Reset Ball", r, Key {r, ctrl=true};
       bool NotifySelect(MenuItem selection, Modifiers mods)
       {
@@ -358,7 +358,7 @@ class Form1 : Window
          Update(null);
          return true;
       }
-   }
+   };
 
    bool MyCustomMenu(MenuItem selection, Modifiers mods) {
       if (browseItem.checked)

diff --git a/samples/guiAndGfx/reminder/Reminder.ec b/samples/guiAndGfx/reminder/Reminder.ec
index fb16cb7..7f39130 100644 (file)
--- a/samples/guiAndGfx/reminder/Reminder.ec
+++ b/samples/guiAndGfx/reminder/Reminder.ec
@@ -98,7 +98,7 @@ class ReminderWindow : Window
          }
          return true;
       }
-   }
+   };
 }
 
 ReminderWindow reminderWindow { };