Merge trunk to the cpcmode5 branch. This gets us a more recent grafx2 with the cpcmode5 drawing. Now to make this mode optional so users can still work in regular mode :)

git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1719 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2011-02-13 21:49:31 +00:00
parent 4e60f5ad74
commit eba26aaa96
65 changed files with 8669 additions and 3286 deletions
--- a/src/hotkeys.h
+++ b/src/hotkeys.h
@@ -33,6 +33,8 @@
 #endif
 #include <SDL.h>

+#define NB_SHORTCUTS 199   ///< Number of actions that can have a key combination associated to it.
+
 /*** Types definitions and structs ***/

 typedef struct