From 0e5571b2e8b26be612d7cfe288994b496003f665 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Sat, 17 Apr 2021 16:40:53 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20'a4/game.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a4/game.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/a4/game.c b/a4/game.c index 6599cf7..22c43b3 100644 --- a/a4/game.c +++ b/a4/game.c @@ -28,7 +28,7 @@ int game_event(struct event* event,void* game){ // Get state pointer struct game* state = game; char msg[200]; - sprintf(msg,"%d",event->type); + sprintf(msg,"%d",event->type); set_message(msg,10,0); if ( event->type == EVENT_ESC){ // Non zero means finish the loop and stop the game. @@ -69,20 +69,7 @@ int game_event(struct event* event,void* game){ int cx = state->catx_position + state->catx; int cy = state->caty_position + state->caty; if (cx < 1 || cy < 0 || cx > event->width || cy > event->height){ - /*state->catx_position = cx; - state->caty_position = cy; - if(state->catx_position < 0){ - state->catx_position = 0; - } - else if(state->catx_position >= event->width){ - state->catx_position = event->width-1; - } - else if(state->caty_position < 0){ - state->caty_position = 0; - } - else if(state->caty_position >= event->height){ - state->caty_position = event->height-1; - }*/ + } else { state->catx_position = cx; @@ -108,8 +95,7 @@ int game_event(struct event* event,void* game){ else if (m == 3 && state->mousey[i] < event->height){ state->mousey[i] += 1; } - } - //Je + } } else if (event->type == EVENT_KEY){ // Move cat according to keyboard @@ -131,14 +117,14 @@ int game_event(struct event* event,void* game){ } } // Draw world state - // + // Draw cat clear_screen(); set_color_cell('c',state->catx_position,state->caty_position,COLOR_YELLOW,COLOR_RED); set_color_cell('-',state->catx_position-1,state->caty_position,COLOR_YELLOW,COLOR_GREEN); //set_cell('c',state->catx_position,state->caty_position); - // Draw mouse + // Draw mouse for(int i = 0; i < MOUSE_COUNT; i++){ if(state->mouse_state[i] != 1){ set_cell('m', state->mousex[i], state->mousey[i]);