Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+10 -10
View File
@@ -11,7 +11,7 @@
// Make sure the application has a name
//
#define APPLICATION_NAME "Jagged Alliance 2"
#define APPLICATION_NAME "Jagged Alliance 2"
//
// Basic defines for the video manager. These represent the starting values
@@ -25,8 +25,8 @@
#define WINDOWED_MODE
#endif
extern UINT16 SCREEN_WIDTH;
extern UINT16 SCREEN_HEIGHT;
extern UINT16 SCREEN_WIDTH;
extern UINT16 SCREEN_HEIGHT;
extern int iResolution; // Resolution id from the ini file
extern int iPlayIntro;
@@ -35,19 +35,19 @@ extern INT16 iScreenHeightOffset;
extern BOOLEAN fDisplayOverheadMap;
#define PIXEL_DEPTH 16
#define PIXEL_DEPTH 16
//
// These defines are used as MUTEX handles.
//
#define MAX_MUTEX_HANDLES 32
#define MAX_MUTEX_HANDLES 32
#define REFRESH_THREAD_MUTEX 0
#define FRAME_BUFFER_MUTEX 1
#define MOUSE_BUFFER_MUTEX 2
#define DIRTY_BUFFER_MUTEX 3
#define SCROLL_MESSAGE_MUTEX 4
#define REFRESH_THREAD_MUTEX 0
#define FRAME_BUFFER_MUTEX 1
#define MOUSE_BUFFER_MUTEX 2
#define DIRTY_BUFFER_MUTEX 3
#define SCROLL_MESSAGE_MUTEX 4
#endif