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
+4 -4
View File
@@ -52,7 +52,7 @@ typedef enum
CURSOR_KNIFE_NOGO_ON2,
CURSOR_CROSS_REG,
CURSOR_CROSS_ACTIVE,
CURSOR_WWW,
CURSOR_WWW,
CURSOR_LAPTOP_SCREEN,
CURSOR_IBEAM,
CURSOR_LOOK,
@@ -152,8 +152,8 @@ typedef enum
CURSOR_STRATEGIC_BULLSEYE,
CURSOR_JUMP_OVER,
CURSOR_FUEL,
CURSOR_FUEL_RED,
CURSOR_FUEL,
CURSOR_FUEL_RED,
} CursorTypeDefines;
@@ -181,7 +181,7 @@ typedef enum
C_KNIFE2,
C_CROSS1,
C_CROSS2,
C_WWW,
C_WWW,
C_LAPTOPSCREEN,
C_IBEAM,
C_LOOK,