mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
****************************************************************************
** Merged Source Code from Development trunk, for the Spring 2011 Release ** **************************************************************************** o Development Trunk (Revision: 4444): https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here. New Features are only included in the Development trunk o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!! git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -34,6 +34,8 @@ extern UINT16 CivLastNames[MAXCIVLASTNAMES][10];
|
||||
|
||||
#define LOCKED_NO_NEWGRIDNO 2
|
||||
|
||||
// WANNE: Yes I know, we support up to 254 profiles, but because of compatibility, profile Id = 200
|
||||
// is not a valid profil. We in MercProfiles.xml, the profile id = 200 should not be used!
|
||||
#define NO_PROFILE 200
|
||||
|
||||
#define BATTLE_SND_LOWER_VOLUME 1
|
||||
@@ -815,6 +817,9 @@ public:
|
||||
// HEADROCK HAM 4: Two more values. These record the shooter's previous Counter Force applied on the gun.
|
||||
FLOAT dPrevCounterForceX;
|
||||
FLOAT dPrevCounterForceY;
|
||||
// CHRISL: Track initial offsets for autofire
|
||||
FLOAT dInitialMuzzleOffsetX;
|
||||
FLOAT dInitialMuzzleOffsetY;
|
||||
|
||||
INT8 bTilesMoved;
|
||||
FLOAT dNextBleed;
|
||||
@@ -1258,9 +1263,9 @@ public:
|
||||
void BeginTyingToFall( void );
|
||||
|
||||
//legion by Jazz
|
||||
void BeginSoldierFence( void );
|
||||
void BeginSoldierFenceUp( void );
|
||||
void BeginSoldierClimbWall( void );
|
||||
void BeginSoldierClimbWindow( void );
|
||||
void BeginSoldierClimbWallUp( void );
|
||||
|
||||
void HandleAnimationProfile( UINT16 usAnimState, BOOLEAN fRemove );
|
||||
void HandleSoldierTakeDamageFeedback( void );
|
||||
|
||||
Reference in New Issue
Block a user