From ba500c0f89fa586ebf47158feb7eb675c024a584 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 26 May 2020 00:59:44 +0000 Subject: [PATCH] decrease tmpdisk git-svn-id: svn://kolibrios.org@7985 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/diff/diff.c | 2 +- programs/cmm/the_bus/the_bus.c | 197 ++++++++++++++++----------------- programs/cmm/tmpdisk/t_gui.c | 7 +- programs/cmm/tmpdisk/tmpdisk.c | 3 +- 4 files changed, 102 insertions(+), 107 deletions(-) diff --git a/programs/cmm/diff/diff.c b/programs/cmm/diff/diff.c index 99398582de..014a291e40 100644 --- a/programs/cmm/diff/diff.c +++ b/programs/cmm/diff/diff.c @@ -75,7 +75,7 @@ bool getparam() dstfilename = #param + strlen(#param) + 3; return true; } - notify("'Wrong params specified. Use next format:\nAPPPATH \"PARAM1\" \"PARAM2\"' -E"); + notify("'Wrong params! Use format:\nAPPPATH \"PARAM1\" \"PARAM2\"' -E"); return false; } diff --git a/programs/cmm/the_bus/the_bus.c b/programs/cmm/the_bus/the_bus.c index e2d8b06044..a73b60b510 100644 --- a/programs/cmm/the_bus/the_bus.c +++ b/programs/cmm/the_bus/the_bus.c @@ -130,113 +130,108 @@ void main() road.load(abspath("road.png")); objects.load(abspath("objects.png")); - loop() + loop() switch(@WaitEventTimeout(frame_timeout)) { - WaitEventTimeout(frame_timeout); + case evKey: + GetKeys(); + if (key_scancode == SCAN_CODE_ESC) + { + if (screen_type==SCR_GAME) SetScreen(SCR_MENU_MAIN); + else if (screen_type==SCR_MENU_MAIN) ExitProcess(); + } + if (key_scancode == SCAN_CODE_DOWN) && (screen_type==SCR_MENU_MAIN) + { + if (active_menu_item<>3) active_menu_item++; ELSE active_menu_item=0; + DrawMenuList(); + } + if (key_scancode == SCAN_CODE_UP) && (screen_type==SCR_MENU_MAIN) + { + if (active_menu_item<>0) active_menu_item--; ELSE active_menu_item=3; + DrawMenuList(); + } + if (key_scancode == SCAN_CODE_ENTER) && (screen_type==SCR_MENU_MAIN) + { + if (active_menu_item==0) + { + StartNewGame(); + SetScreen(SCR_GAME); + } + if (active_menu_item==1) notify(CONTROLS_TEXT); + if (active_menu_item==2) notify(ABOUT_TEXT); + if (active_menu_item==3) ExitProcess(); + } + if (key_scancode == SCAN_CODE_SPACE) && (screen_type==SCR_GAME) + { + DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); + if (bus_x==1) bus_x=0; else bus_x=1; + } + if (key_scancode == SCAN_CODE_LEFT) && (screen_type==SCR_GAME) + { + if (bus_x==0) break; + DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); + bus_x=0; + } + if (key_scancode == SCAN_CODE_RIGHT) && (screen_type==SCR_GAME) + { + if (bus_x==1) break; + DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); + bus_x=1; + } + if (key_scancode == SCAN_CODE_KEY_P) + { + if (screen_type==SCR_MENU_MAIN) break; + else if (screen_type==SCR_GAME) SetScreen(SCR_PAUSE); + else if (screen_type==SCR_PAUSE) SetScreen(SCR_GAME); + } + break; + + case evReDraw: + DefineAndDrawWindow(250,150,WIN_X-1,WIN_Y-1,0x01,0,THE_BUS_TEXT,0); //0x74 is also possible if you fix bottom border + DrawScreen(); + break; + + case evButton: + ExitProcess(); + break; + + default: + if (screen_type==SCR_GAME) + { + if ((don_x == bus_x)&&(don_y + don_h > bus_y )&&(don_y < bus_y + don_h )) { + lifes--; + DrawBus(bus_x*80+200,bus_y); + DrawBoom(bus_x*80+180,bus_y+10); + pause(150); + GetNewObstacle(RAND); + DrawScreen(); + } - switch(EAX & 0xFF) - { - case evKey: - GetKeys(); - if (key_scancode == SCAN_CODE_ESC) - { - if (screen_type==SCR_GAME) SetScreen(SCR_MENU_MAIN); - else if (screen_type==SCR_MENU_MAIN) ExitProcess(); + if (lifes==0) { + DrawGameOverMessage(); + break; } - if (key_scancode == SCAN_CODE_DOWN) && (screen_type==SCR_MENU_MAIN) - { - if (active_menu_item<>3) active_menu_item++; ELSE active_menu_item=0; - DrawMenuList(); - } - if (key_scancode == SCAN_CODE_UP) && (screen_type==SCR_MENU_MAIN) - { - if (active_menu_item<>0) active_menu_item--; ELSE active_menu_item=3; - DrawMenuList(); - } - if (key_scancode == SCAN_CODE_ENTER) && (screen_type==SCR_MENU_MAIN) - { - if (active_menu_item==0) - { - StartNewGame(); - SetScreen(SCR_GAME); - } - if (active_menu_item==1) notify(CONTROLS_TEXT); - if (active_menu_item==2) notify(ABOUT_TEXT); - if (active_menu_item==3) ExitProcess(); - } - if (key_scancode == SCAN_CODE_SPACE) && (screen_type==SCR_GAME) - { - DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); - if (bus_x==1) bus_x=0; else bus_x=1; - } - if (key_scancode == SCAN_CODE_LEFT) && (screen_type==SCR_GAME) - { - if (bus_x==0) break; - DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); - bus_x=0; - } - if (key_scancode == SCAN_CODE_RIGHT) && (screen_type==SCR_GAME) - { - if (bus_x==1) break; - DrawBar(bus_x*80+200, bus_y, bus_w, bus_h+1, COLOR_ROAD); - bus_x=1; - } - if (key_scancode == SCAN_CODE_KEY_P) - { - if (screen_type==SCR_MENU_MAIN) break; - else if (screen_type==SCR_GAME) SetScreen(SCR_PAUSE); - else if (screen_type==SCR_PAUSE) SetScreen(SCR_GAME); - } - break; - - case evReDraw: - DefineAndDrawWindow(250,150,WIN_X-1,WIN_Y-1,0x01,0,THE_BUS_TEXT,0); //0x74 is also possible if you fix bottom border - DrawScreen(); - break; - - case evButton: - ExitProcess(); - break; - - default: - if (screen_type==SCR_GAME) - { - if ((don_x == bus_x)&&(don_y + don_h > bus_y )&&(don_y < bus_y + don_h )) { - lifes--; - DrawBus(bus_x*80+200,bus_y); - DrawBoom(bus_x*80+180,bus_y+10); - pause(150); - GetNewObstacle(RAND); - DrawScreen(); - } - - if (lifes==0) { - DrawGameOverMessage(); - break; - } - don_y += don_step_y; + don_y += don_step_y; - if (don_y - don_step_y >= WIN_Y) - { - GetNewObstacle(RAND); - score++; - bus_y -= don_step_y+1; - DrawBar(bus_x*80+200, bus_y+bus_h, bus_w, don_step_y+1, COLOR_ROAD); - WriteScore(); - } - - if (score) && (score % 15 == 0) - { - score++; - NewLevel(); - DrawScreen(); - don_step_y++; - } - - DrawRoad(); + if (don_y - don_step_y >= WIN_Y) + { + GetNewObstacle(RAND); + score++; + bus_y -= don_step_y+1; + DrawBar(bus_x*80+200, bus_y+bus_h, bus_w, don_step_y+1, COLOR_ROAD); + WriteScore(); } - } + + if (score) && (score % 15 == 0) + { + score++; + NewLevel(); + DrawScreen(); + don_step_y++; + } + + DrawRoad(); + } } } diff --git a/programs/cmm/tmpdisk/t_gui.c b/programs/cmm/tmpdisk/t_gui.c index 0d219b4183..4065fa7f36 100644 --- a/programs/cmm/tmpdisk/t_gui.c +++ b/programs/cmm/tmpdisk/t_gui.c @@ -55,20 +55,21 @@ void Main_Window() word id; int x; + #define NO_DLL_INIT load_dll(boxlib, #box_lib_init,0); GetNewSizeDisk(); edit_disk_size.left = strlen(SIZE_TEXT)*8 + 13; - SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER); + @SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER); loop() { - switch(WaitEvent()) + switch(@WaitEvent()) { case evMouse: edit_box_mouse stdcall (#edit_disk_size); break; case evButton: - id=GetButtonID(); + id = @GetButtonID(); if (id==1) return; if (id==10) AddDisk(); if (id==11) { diff --git a/programs/cmm/tmpdisk/tmpdisk.c b/programs/cmm/tmpdisk/tmpdisk.c index f16c998e00..8516166af9 100644 --- a/programs/cmm/tmpdisk/tmpdisk.c +++ b/programs/cmm/tmpdisk/tmpdisk.c @@ -52,8 +52,7 @@ int driver_handle; void main() { - driver_handle = LoadDriver("tmpdisk"); - if (driver_handle==0) + if (! driver_handle = LoadDriver("tmpdisk")) { notify("'TmpDisk\nError: /rd/1/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE"); ExitProcess();