Procházet zdrojové kódy

Fixed compiler error on Linux for Control::parseAutoSize

seanpaultaylor před 12 roky
rodič
revize
704f51c81c

+ 1 - 1
gameplay/src/Control.h

@@ -1410,7 +1410,7 @@ private:
 
     bool updateBoundsInternal(const Vector2& offset);
 
-    AutoSize Control::parseAutoSize(const char* str);
+    AutoSize parseAutoSize(const char* str);
 
     Theme::Style::Overlay** getOverlays(unsigned char overlayTypes, Theme::Style::Overlay** overlays);
 

+ 34 - 34
samples/character/game.atc.config

@@ -1,40 +1,40 @@
 aliases
 {
-backboard = res/atc/backboard.dds
-basketball = res/atc/basketball.dds
-basketballnet = res/atc/basketballnet.dds
-book = res/atc/book.dds
-bookshelf = res/atc/bookshelf.dds
-character = res/atc/boy.dds
-decals = res/atc/decals.dds
-door = res/atc/door.dds
-doorframe = res/atc/doorframe.dds
-easel = res/atc/easel.dds
-floor = res/atc/floor.dds
-floortiles = res/atc/floortiles.dds
-gamepad = res/atc/gamepad.dds
-playtable = res/atc/playtable.dds
-shadow = res/atc/shadow.dds
-storageorganizer = res/atc/storageorganizer.dds
-tableleg1 = res/atc/tableleg1.dds
-tableleg2 = res/atc/tableleg2.dds
-tableleg3 = res/atc/tableleg3.dds
-tableleg4 = res/atc/tableleg4.dds
-tabletop = res/atc/tabletop.dds
-tiles = res/atc/tiles.dds
-tilesn = res/atc/tilesn.dds
-toybox = res/atc/toybox.dds
-walleast = res/atc/walleast.dds
-wallnorth = res/atc/wallnorth.dds
-walloverhang = res/atc/walloverhang.dds
-wallsouth = res/atc/wallsouth.dds
-wallwest = res/atc/wallwest.dds
-windowledge = res/atc/windowledge.dds
-wood = res/atc/wood.dds
-woodn = res/atc/woodn.dds
+    backboard = res/atc/backboard.dds
+    basketball = res/atc/basketball.dds
+    basketballnet = res/atc/basketballnet.dds
+    book = res/atc/book.dds
+    bookshelf = res/atc/bookshelf.dds
+    character = res/atc/boy.dds
+    decals = res/atc/decals.dds
+    door = res/atc/door.dds
+    doorframe = res/atc/doorframe.dds
+    easel = res/atc/easel.dds
+    floor = res/atc/floor.dds
+    floortiles = res/atc/floortiles.dds
+    gamepad = res/atc/gamepad.dds
+    playtable = res/atc/playtable.dds
+    shadow = res/atc/shadow.dds
+    storageorganizer = res/atc/storageorganizer.dds
+    tableleg1 = res/atc/tableleg1.dds
+    tableleg2 = res/atc/tableleg2.dds
+    tableleg3 = res/atc/tableleg3.dds
+    tableleg4 = res/atc/tableleg4.dds
+    tabletop = res/atc/tabletop.dds
+    tiles = res/atc/tiles.dds
+    tilesn = res/atc/tilesn.dds
+    toybox = res/atc/toybox.dds
+    walleast = res/atc/walleast.dds
+    wallnorth = res/atc/wallnorth.dds
+    walloverhang = res/atc/walloverhang.dds
+    wallsouth = res/atc/wallsouth.dds
+    wallwest = res/atc/wallwest.dds
+    windowledge = res/atc/windowledge.dds
+    wood = res/atc/wood.dds
+    woodn = res/atc/woodn.dds
 }
 
 gamepads
 {
-form = res/common/gamepad.form
-}
+    form = res/common/gamepad.form
+}

+ 0 - 1
samples/character/game.dxt.config

@@ -4,7 +4,6 @@ window
     width = 1280
     height = 720
     fullscreen = false
-    samples = 2
 }
 
 aliases

+ 1 - 1
samples/racer/game.dxt.config

@@ -1,9 +1,9 @@
 window
 {
+    title = Racer
     width = 1280
     height = 720
     fullscreen = false
-    title = Racer
 }
 
 scripts

+ 1 - 1
samples/racer/game.png.config

@@ -1,9 +1,9 @@
 window
 {
+    title = Racer
     width = 1280
     height = 720
     fullscreen = false
-    title = Racer
 }
 
 scripts