Skip to content

Commit

Permalink
Updated version number
Browse files Browse the repository at this point in the history
  • Loading branch information
matt77hias committed Nov 1, 2017
1 parent 51f91b1 commit f521789
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 21 deletions.
2 changes: 1 addition & 1 deletion MAGE/MAGE/src/core/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The version numbers (major/minor/patch) must be macros, allowing the use of
// these numbers in preprocessor directives (e.g. if).
#define MAGE_VERSION_MAJOR 0
#define MAGE_VERSION_MINOR 98
#define MAGE_VERSION_MINOR 99
#define MAGE_VERSION_PATCH 0

#define MAGE_QUOTE(S) #S
Expand Down
52 changes: 33 additions & 19 deletions MAGE/MAGE/src/ui/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,20 @@ namespace mage {
// Sent to the window with the keyboard focus when a nonsystem key
// is released.

// Check whether the user wants to take a screenshot.
if (wParam == VK_SNAPSHOT) {
switch(wParam) {

case VK_SNAPSHOT: {
SwapChain::Get()->TakeScreenShot();
}

// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
default: {
// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
}

}
}

case WM_MENUCHAR: {
Expand Down Expand Up @@ -107,33 +112,42 @@ namespace mage {
// in this case, the WM_SYSKEYUP message is sent to the active
// window.

// Check whether the user wants to take a screenshot.
if (wParam == VK_SNAPSHOT) {
switch (wParam) {

case VK_SNAPSHOT: {
SwapChain::Get()->TakeScreenShot();
}

// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
default: {
// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
}

}
}

case WM_SYSKEYDOWN: {
// Sent to the window with the keyboard focus when the user presses
// the F10 key (which activates the menu bar) or holds down the ALT
// key and then presses another key.

// Check whether the user wants to switch between windowed and full
// screen mode.
if (wParam == VK_RETURN) {
switch (wParam) {

case VK_RETURN: {
Engine::Get()->OnModeSwitch();
break;
}

// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
default: {
// Calls the default window procedure to provide default processing
// for any window messages that an application does not process.
// This function ensures that every message is processed.
return DefWindowProc(hWnd, msg, wParam, lParam);
}

}
}

default: {
Expand Down
2 changes: 1 addition & 1 deletion MAGE/appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#---------------------------------#
# General Configuration #
#---------------------------------#
version: 0.98.{build}
version: 0.99.{build}

branches:
only:
Expand Down

0 comments on commit f521789

Please sign in to comment.