Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

decrease tmpdisk

Browse Source 
git-svn-id: svn://kolibrios.org@7985 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-26 00:59:44 +00:00
parent ddd90c73c8
commit ba500c0f89
4 changed files with 102 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/diff/diff.c
View File

@ -75,7 +75,7 @@ bool getparam()
dstfilename = #param + strlen(#param) + 3; dstfilename = #param + strlen(#param) + 3;
return true; return true;
} }
notify("'Wrong params specified. Use next format:\nAPPPATH \"PARAM1\" \"PARAM2\"' -E"); notify("'Wrong params! Use format:\nAPPPATH \"PARAM1\" \"PARAM2\"' -E");
return false; return false;
} }

197
programs/cmm/the_bus/the_bus.c
View File

@ -130,113 +130,108 @@ void main()
road.load(abspath("road.png")); road.load(abspath("road.png"));
objects.load(abspath("objects.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) if (lifes==0) {
{ DrawGameOverMessage();
case evKey: break;
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();
}
if (lifes==0) {
DrawGameOverMessage();
break;
}
don_y += don_step_y; don_y += don_step_y;
if (don_y - don_step_y >= WIN_Y) if (don_y - don_step_y >= WIN_Y)
{ {
GetNewObstacle(RAND); GetNewObstacle(RAND);
score++; score++;
bus_y -= don_step_y+1; bus_y -= don_step_y+1;
DrawBar(bus_x*80+200, bus_y+bus_h, bus_w, don_step_y+1, COLOR_ROAD); DrawBar(bus_x*80+200, bus_y+bus_h, bus_w, don_step_y+1, COLOR_ROAD);
WriteScore(); WriteScore();
}
if (score) && (score % 15 == 0)
{
score++;
NewLevel();
DrawScreen();
don_step_y++;
}
DrawRoad();
} }
}
if (score) && (score % 15 == 0)
{
score++;
NewLevel();
DrawScreen();
don_step_y++;
}
DrawRoad();
}
} }
} }

7
programs/cmm/tmpdisk/t_gui.c
View File

@ -55,20 +55,21 @@ void Main_Window()
word id; word id;
int x; int x;
#define NO_DLL_INIT
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
GetNewSizeDisk(); GetNewSizeDisk();
edit_disk_size.left = strlen(SIZE_TEXT)*8 + 13; 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() loop()
{ {
switch(WaitEvent()) switch(@WaitEvent())
{ {
case evMouse: case evMouse:
edit_box_mouse stdcall (#edit_disk_size); edit_box_mouse stdcall (#edit_disk_size);
break; break;
case evButton: case evButton:
id=GetButtonID(); id = @GetButtonID();
if (id==1) return; if (id==1) return;
if (id==10) AddDisk(); if (id==10) AddDisk();
if (id==11) { if (id==11) {

3
programs/cmm/tmpdisk/tmpdisk.c
View File

@ -52,8 +52,7 @@ int driver_handle;
void main() void main()
{ {
driver_handle = LoadDriver("tmpdisk"); if (! driver_handle = LoadDriver("tmpdisk"))
if (driver_handle==0)
{ {
notify("'TmpDisk\nError: /rd/1/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE"); notify("'TmpDisk\nError: /rd/1/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE");
ExitProcess(); ExitProcess();