Space Viking's many mercs changes plus numerous generic bug fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
SpaceViking
2009-01-15 01:26:13 +00:00
parent f64f58fbf8
commit f26095d86f
138 changed files with 3493 additions and 3265 deletions
+5 -2
View File
@@ -36,6 +36,7 @@
#include "video2.h"
#endif
#endif
#include <vector>
//ATE: Added to let Wiz default creating mouse regions with no cursor, JA2 default to a cursor ( first one )
@@ -133,14 +134,16 @@ GUI_BUTTON *gpCurrentFastHelpButton;
BOOLEAN gfRenderHilights = TRUE;
BUTTON_PICS ButtonPictures[MAX_BUTTON_PICS];
//BUTTON_PICS ButtonPictures[MAX_BUTTON_PICS];
std::vector<BUTTON_PICS> ButtonPictures(MAX_BUTTON_PICS);
INT32 ButtonPicsLoaded;
UINT32 ButtonDestBuffer = BACKBUFFER;
UINT32 ButtonDestPitch = 640*2;
UINT32 ButtonDestBPP = 16;
GUI_BUTTON *ButtonList[MAX_BUTTONS];
//GUI_BUTTON *ButtonList[MAX_BUTTONS];
std::vector<GUI_BUTTON *> ButtonList(MAX_BUTTONS);
INT32 ButtonsInList=0;