1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.h
+20 -8
View File
@@ -3,6 +3,17 @@
#include "faces.h"
#include "gamescreen.h"
#include "soldier profile type.h"
#include <vector>
typedef struct
{
UINT16 uiIndex; // add
BOOLEAN EnabledSound;
} SOUND_PROFILE_VALUES;
extern SOUND_PROFILE_VALUES gSoundProfileValue[NUM_PROFILES];
// An enumeration for dialog quotes
enum DialogQuoteIDs
@@ -209,12 +220,12 @@ enum DialogQuoteIDs
enum{
SKYRIDER_EXTERNAL_FACE =0,
MINER_FRED_EXTERNAL_FACE,
MINER_MATT_EXTERNAL_FACE,
MINER_OSWALD_EXTERNAL_FACE,
MINER_CALVIN_EXTERNAL_FACE,
MINER_CARL_EXTERNAL_FACE,
NUMBER_OF_EXTERNAL_NPC_FACES,
//MINER_FRED_EXTERNAL_FACE,
//MINER_MATT_EXTERNAL_FACE,
//MINER_OSWALD_EXTERNAL_FACE,
//MINER_CALVIN_EXTERNAL_FACE,
//MINER_CARL_EXTERNAL_FACE,
//NUMBER_OF_EXTERNAL_NPC_FACES,
};
@@ -225,8 +236,9 @@ enum{
UPDATE_BOX_REASON_SHOW_BOX,
};
extern UINT32 uiExternalStaticNPCFaces[ ];
extern UINT32 uiExternalFaceProfileIds[ ];
//extern UINT32 uiExternalStaticNPCFaces[ ];
extern std::vector<UINT32> uiExternalStaticNPCFaces;
//extern UINT32 uiExternalFaceProfileIds[ ];
// Functions for handling dialogue Q
BOOLEAN InitalizeDialogueControl();