From e7fad609d7d7694ebd19212623a0334bd949c741 Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Sun, 20 Sep 2009 15:17:37 +0200 Subject: Added some screenshots :) --- .../2009-09-20-151239_728x426_scrot.png | Bin 0 -> 19999 bytes .../2009-09-20-151253_728x426_scrot.png | Bin 0 -> 19130 bytes .../2009-09-20-151305_728x426_scrot.png | Bin 0 -> 20288 bytes .../2009-09-20-151419_728x426_scrot.png | Bin 0 -> 20087 bytes .../2009-09-20-151527_728x426_scrot.png | Bin 0 -> 17166 bytes .../2009-09-20-151549_728x426_scrot.png | Bin 0 -> 18308 bytes .../2009-09-20-151704_728x426_scrot.png | Bin 0 -> 19768 bytes Source/Kernel/Core/Sys.ns.cpp | 2 +- Source/Kernel/Core/kmain.wtf.cpp | 2 +- Source/Kernel/Melon.ke | Bin 157958 -> 157958 bytes 10 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Media/Screenshots/2009-09-20-151239_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151253_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151305_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151419_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151527_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151549_728x426_scrot.png create mode 100644 Media/Screenshots/2009-09-20-151704_728x426_scrot.png diff --git a/Media/Screenshots/2009-09-20-151239_728x426_scrot.png b/Media/Screenshots/2009-09-20-151239_728x426_scrot.png new file mode 100644 index 0000000..2065146 Binary files /dev/null and b/Media/Screenshots/2009-09-20-151239_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151253_728x426_scrot.png b/Media/Screenshots/2009-09-20-151253_728x426_scrot.png new file mode 100644 index 0000000..580e06c Binary files /dev/null and b/Media/Screenshots/2009-09-20-151253_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151305_728x426_scrot.png b/Media/Screenshots/2009-09-20-151305_728x426_scrot.png new file mode 100644 index 0000000..4dde726 Binary files /dev/null and b/Media/Screenshots/2009-09-20-151305_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151419_728x426_scrot.png b/Media/Screenshots/2009-09-20-151419_728x426_scrot.png new file mode 100644 index 0000000..bb17e33 Binary files /dev/null and b/Media/Screenshots/2009-09-20-151419_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151527_728x426_scrot.png b/Media/Screenshots/2009-09-20-151527_728x426_scrot.png new file mode 100644 index 0000000..6352b44 Binary files /dev/null and b/Media/Screenshots/2009-09-20-151527_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151549_728x426_scrot.png b/Media/Screenshots/2009-09-20-151549_728x426_scrot.png new file mode 100644 index 0000000..74883b5 Binary files /dev/null and b/Media/Screenshots/2009-09-20-151549_728x426_scrot.png differ diff --git a/Media/Screenshots/2009-09-20-151704_728x426_scrot.png b/Media/Screenshots/2009-09-20-151704_728x426_scrot.png new file mode 100644 index 0000000..109c16a Binary files /dev/null and b/Media/Screenshots/2009-09-20-151704_728x426_scrot.png differ diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index 081e7a5..c3561f2 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -124,7 +124,7 @@ void reboot() { void halt() { asm volatile("cli"); Log::close(); - String message("MELON SEZ : KTHXBYE, IOU CAN NAOW TURNZ OFF UR COMPUTER."); + String message("MELON SEZ : KTHXBYE, U CAN NAOW TURNZ OFF UR COMPUTER."); SimpleVT vt(3, message.size() + 16, 6, 0); vt.map(); vt << "\n\t" << message; diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 6862e18..366b6b9 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -115,7 +115,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Log::log(KL_STATUS, "kmain : Registered textual VGA output"); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver - Kbd::loadKeymap("fr"); + if (!Kbd::loadKeymap("fr")) Log::log(KL_ERROR, "kmain : could not load french keymap."); Kbd::setFocus(kvt); //Set focus to virtual terminal Log::log(KL_STATUS, "kmain : Keyboard set up"); diff --git a/Source/Kernel/Melon.ke b/Source/Kernel/Melon.ke index 22a7a87..801794b 100755 Binary files a/Source/Kernel/Melon.ke and b/Source/Kernel/Melon.ke differ -- cgit v1.2.3