From b5249a171772971af5a3917319c173671c1aa574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruben=20Mu=CC=88ller?= Date: Sat, 20 Aug 2011 17:00:06 +0200 Subject: [PATCH 1/2] stuff --- src/Draw.pbi | 2 +- src/Functions.pbi | 2 +- src/Main.pb | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Draw.pbi b/src/Draw.pbi index 47e2a89..34b1357 100644 --- a/src/Draw.pbi +++ b/src/Draw.pbi @@ -34,7 +34,7 @@ Procedure DrawRunningGame() Box(0, 0, 200, 200, RGB(0, 255, 0)) EndProcedure ; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 26 +; CursorPosition = 8 ; Folding = - ; EnableUnicode ; EnableThread diff --git a/src/Functions.pbi b/src/Functions.pbi index 5e9a352..8936786 100644 --- a/src/Functions.pbi +++ b/src/Functions.pbi @@ -1 +1 @@ -; This file holds all the functions If it gets too big, ; we can split it in categories ; ***************************************************************************** ; * Menu Procedure Menu_GotoCurrent() If *ActiveMenu\Entries()\Selected <> #True FirstElement(*ActiveMenu\Entries()); ForEach *ActiveMenu\Entries() If *ActiveMenu\Entries()\Selected = #True Break EndIf Next EndIf EndProcedure ; ***************************************************************************** ; IDE Options = PureBasic 4.51 (MacOS X - x86) ; CursorPosition = 13 ; Folding = - ; EnableXP \ No newline at end of file +; This file holds all the functions If it gets too big, ; we can split it in categories ; ***************************************************************************** ; * Tileset Procedure InitTileset() Debug "Init tileset" EndProcedure ; ***************************************************************************** ; ***************************************************************************** ; * Menu Procedure Menu_GotoCurrent() If *ActiveMenu\Entries()\Selected <> #True FirstElement(*ActiveMenu\Entries()); ForEach *ActiveMenu\Entries() If *ActiveMenu\Entries()\Selected = #True Break EndIf Next EndIf EndProcedure ; ***************************************************************************** ; IDE Options = PureBasic 4.51 (MacOS X - x86) ; CursorPosition = 7 ; Folding = - ; EnableXP \ No newline at end of file diff --git a/src/Main.pb b/src/Main.pb index 2699f21..a1a2b1b 100644 --- a/src/Main.pb +++ b/src/Main.pb @@ -47,6 +47,8 @@ If ReadFile(0, "../data/menu.data") CloseFile(0) EndIf +InitTileset() + Menus("MAIN_MENU")\Title = "ESCape" Define Item.GameMenuItem @@ -110,8 +112,7 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent Until KeyboardPushed(#PB_Key_Escape) EndIf ; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 65 -; FirstLine = 9 +; CursorPosition = 49 ; EnableXP ; EnableCompileCount = 0 ; EnableBuildCount = 0 \ No newline at end of file From 21cb61eb0a91e59bcc5bd01dfe882d817a39f994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruben=20Mu=CC=88ller?= Date: Sat, 20 Aug 2011 17:04:33 +0200 Subject: [PATCH 2/2] cleanup --- src/Draw.pbi | 10 +--------- src/Events.pbi | 10 +--------- src/Functions.pbi | 2 +- src/Globals.pbi | 7 +------ src/Main.pb | 7 ++----- src/Structs.pbi | 9 +-------- 6 files changed, 7 insertions(+), 38 deletions(-) diff --git a/src/Draw.pbi b/src/Draw.pbi index 34b1357..74a16f6 100644 --- a/src/Draw.pbi +++ b/src/Draw.pbi @@ -32,12 +32,4 @@ EndProcedure Procedure DrawRunningGame() Box(0, 0, 200, 200, RGB(0, 255, 0)) -EndProcedure -; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 8 -; Folding = - -; EnableUnicode -; EnableThread -; EnableXP -; EnableCompileCount = 0 -; EnableBuildCount = 0 \ No newline at end of file +EndProcedure \ No newline at end of file diff --git a/src/Events.pbi b/src/Events.pbi index 8e98cd3..c13a460 100644 --- a/src/Events.pbi +++ b/src/Events.pbi @@ -35,12 +35,4 @@ Procedure HandleEventMenu() EndProcedure Procedure HandleEventRunningGame() -EndProcedure -; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 32 -; Folding = - -; EnableUnicode -; EnableThread -; EnableXP -; EnableCompileCount = 0 -; EnableBuildCount = 0 \ No newline at end of file +EndProcedure \ No newline at end of file diff --git a/src/Functions.pbi b/src/Functions.pbi index 8936786..ac27194 100644 --- a/src/Functions.pbi +++ b/src/Functions.pbi @@ -1 +1 @@ -; This file holds all the functions If it gets too big, ; we can split it in categories ; ***************************************************************************** ; * Tileset Procedure InitTileset() Debug "Init tileset" EndProcedure ; ***************************************************************************** ; ***************************************************************************** ; * Menu Procedure Menu_GotoCurrent() If *ActiveMenu\Entries()\Selected <> #True FirstElement(*ActiveMenu\Entries()); ForEach *ActiveMenu\Entries() If *ActiveMenu\Entries()\Selected = #True Break EndIf Next EndIf EndProcedure ; ***************************************************************************** ; IDE Options = PureBasic 4.51 (MacOS X - x86) ; CursorPosition = 7 ; Folding = - ; EnableXP \ No newline at end of file +; This file holds all the functions If it gets too big, ; we can split it in categories ; ***************************************************************************** ; * Tileset Procedure InitTileset() LoadImage EndProcedure ; ***************************************************************************** ; ***************************************************************************** ; * Menu Procedure Menu_GotoCurrent() If *ActiveMenu\Entries()\Selected <> #True FirstElement(*ActiveMenu\Entries()); ForEach *ActiveMenu\Entries() If *ActiveMenu\Entries()\Selected = #True Break EndIf Next EndIf EndProcedure ; ***************************************************************************** \ No newline at end of file diff --git a/src/Globals.pbi b/src/Globals.pbi index bec37f9..3392bfe 100644 --- a/src/Globals.pbi +++ b/src/Globals.pbi @@ -12,9 +12,4 @@ Global *ActiveMenu.GameMenu ; Fonts Global Font_H1 = LoadFont(1, "Courier", 40, #PB_Font_Bold) -Global Font_H2 = LoadFont(2, "Verdana", 18) -; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 13 -; EnableXP -; EnableCompileCount = 0 -; EnableBuildCount = 0 \ No newline at end of file +Global Font_H2 = LoadFont(2, "Verdana", 18) \ No newline at end of file diff --git a/src/Main.pb b/src/Main.pb index a1a2b1b..f1fed6a 100644 --- a/src/Main.pb +++ b/src/Main.pb @@ -111,8 +111,5 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent Delay(1) Until KeyboardPushed(#PB_Key_Escape) EndIf -; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 49 -; EnableXP -; EnableCompileCount = 0 -; EnableBuildCount = 0 \ No newline at end of file + +End \ No newline at end of file diff --git a/src/Structs.pbi b/src/Structs.pbi index a974420..9602bfd 100644 --- a/src/Structs.pbi +++ b/src/Structs.pbi @@ -30,11 +30,4 @@ EndStructure Structure GameMenu Title.s List Entries.GameMenuItem() -EndStructure -; IDE Options = PureBasic 4.51 (MacOS X - x86) -; CursorPosition = 32 -; EnableUnicode -; EnableThread -; EnableXP -; EnableCompileCount = 1 -; EnableBuildCount = 0 \ No newline at end of file +EndStructure \ No newline at end of file