Merged from revision: 7359

Fixes (by Buggler)
- new error message when launching game in fullscreen beyond desktop resolution
- fixed cycling previous item hotkey in cheat mode
- refactored main menu button and hotkey code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-07-22 16:40:02 +00:00
parent 9f5aa4c227
commit a79be62f21
13 changed files with 129 additions and 102 deletions
+6
View File
@@ -2527,6 +2527,12 @@ extern STR16 gszMPMapscreenText[];
enum
{
ADDTEXT_16BPP_REQUIRED,
ADDTEXT_LOWERRES_REQUIRED,
ERROR_MAX_MERCSVEHICLES,
ERROR_MAX_ENEMIES,
ERROR_MAX_CREATURES,
ERROR_MAX_MILITIA,
ERROR_MAX_CIVILIANS,
};
extern STR16 Additional113Text[];
extern STR16 ranks[];