From 58240b0509d11b09ce2994b88308650e7cfb93bd Mon Sep 17 00:00:00 2001
From: Aleksa Vučković <aleksav013@gmail.com>
Date: Mon, 6 Jun 2022 00:11:11 +0200
Subject: game and keyboard small fix

---
 src/as/cpuid.s                  | 4 ++--
 src/c/keyboard.c                | 1 +
 src/c/shell/game.c              | 4 ++--
 src/c/shell/neofetch.c          | 4 ++--
 src/c/tty.c                     | 1 +
 src/include/source/shell/game.h | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/as/cpuid.s b/src/as/cpuid.s
index 701fa0d..043b2a4 100644
--- a/src/as/cpuid.s
+++ b/src/as/cpuid.s
@@ -3,9 +3,9 @@
 cpuid_vendor:
     pushl %ebp
     mov %esp, %ebp
-    pushl %ebx
     pushl %edi
     pushl %esi
+    pushl %ebx
 
     mov $0x0, %eax
     cpuid
@@ -16,8 +16,8 @@ cpuid_vendor:
     movl %edx, 4(%eax)
     movl %ecx, 8(%eax)
 
+    popl %ebx
     popl %esi
     popl %edi
-    popl %ebx
     popl %ebp
     ret
diff --git a/src/c/keyboard.c b/src/c/keyboard.c
index fb4361d..47c4a22 100644
--- a/src/c/keyboard.c
+++ b/src/c/keyboard.c
@@ -54,6 +54,7 @@ void enter()
         }
         buffer_index=0;
     }
+    else prompt();
     return;
 }
 
diff --git a/src/c/shell/game.c b/src/c/shell/game.c
index e7c5d1e..ce7793b 100644
--- a/src/c/shell/game.c
+++ b/src/c/shell/game.c
@@ -83,7 +83,7 @@ void game_timer_handler()
                 else y=VGA_HEIGHT-1;
                 break;
             case 2:
-                if(y<VGA_HEIGHT) y++;
+                if(y<VGA_HEIGHT-1) y++;
                 else y=0;
                 break;
             case 3:
@@ -91,7 +91,7 @@ void game_timer_handler()
                 else x=VGA_WIDTH-1;
                 break;
             case 4:
-                if(x<VGA_WIDTH) x++;
+                if(x<VGA_WIDTH-1) x++;
                 else x=0;
                 break;
             default:
diff --git a/src/c/shell/neofetch.c b/src/c/shell/neofetch.c
index 4cfc250..87bff6a 100644
--- a/src/c/shell/neofetch.c
+++ b/src/c/shell/neofetch.c
@@ -9,7 +9,7 @@ void neofetch(void)
 {
     set_color(VGA_COLOR_WHITE,VGA_COLOR_BLACK);
     printf("      .                ");         printf("Dobrodosli u moj     \n");
-    printf("     J:L    (\"\"\")      ");      printf("operativni sistem :) \n");
+    printf("     A:A    (\"\"\")      ");      printf("operativni sistem :) \n");
     printf("     |:|     III       ");         printf("Uzivajte!            \n");
     printf("     |:|     III       ");         printf("                     \n");
     printf("     |:|     III       ");         printf("Welcome to my        \n");
@@ -25,7 +25,7 @@ void neofetch(void)
     printf("     III     |:|       ");         printf("                     \n");
     printf("     III     |:|       ");         printf("                     \n");
     printf("     III     |:|       ");         printf("napravio/made by:    \n");
-    printf("    (___)    J:F       ");         printf("Aleksa Vuckovic      \n");
+    printf("    (___)    V:V       ");         printf("Aleksa Vuckovic      \n");
     printf("              \"        ");        printf("                     \n");
 
     for(size_t i=0;i<16;i++)
diff --git a/src/c/tty.c b/src/c/tty.c
index 0ec1408..b15811b 100644
--- a/src/c/tty.c
+++ b/src/c/tty.c
@@ -104,6 +104,7 @@ void tty(char *buffer)
     else if(stringcmp(parts[0],"neofetch")) neofetch();
     else if(stringcmp(parts[0],"help")) help();
     else if(stringcmp(parts[0],"game")) game_init();
+    else if(stringcmp(parts[0],"")) ;
     else printf("command not found: %s\n",parts[0]);
 
     if (!stringcmp(parts[0],"game")) prompt();
diff --git a/src/include/source/shell/game.h b/src/include/source/shell/game.h
index f6dcbc8..bb705bf 100644
--- a/src/include/source/shell/game.h
+++ b/src/include/source/shell/game.h
@@ -4,5 +4,6 @@
 #include<types.h>
 
 void game_keyboard_handler(uint16_t keycode);
+void game_timer_handler(void);
 
 #endif
-- 
cgit v1.2.3