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

Additional dialogue can be used for consuming specific items

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8531 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-02-28 20:29:30 +00:00
parent f4171a3889
commit 90de5ed424
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+8 -8
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8531 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8531 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8531 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8531 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8531 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,11 +46,11 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8531 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8531 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8530 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.8531 (Development Build)" };
#endif #endif
#endif #endif
Tactical/Dialogue Control.h
+1
View File
@@ -360,6 +360,7 @@ enum AdditionalDialogEvents
ADE_WEATHERCHANGE, // the weather has changed, and we can warn the player about that ADE_WEATHERCHANGE, // the weather has changed, and we can warn the player about that
ADE_SKILL_RESULT, // we used a skill, and comment on the result ADE_SKILL_RESULT, // we used a skill, and comment on the result
ADE_GRENADEWARNING, // a delayed enemy grenade was dropped nearby ADE_GRENADEWARNING, // a delayed enemy grenade was dropped nearby
ADE_CONSUMEITEM, // we applied an item to us
}; };
// We call this function from several places. It uses the dialogue functions, but calls a Lua script to know whether something, and what, should be said // We call this function from several places. It uses the dialogue functions, but calls a Lua script to know whether something, and what, should be said
Tactical/Soldier Control.cpp
+3
View File
@@ -24095,6 +24095,9 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce
if ( fSuccess ) if ( fSuccess )
{ {
// Flugente: additional dialogue
AdditionalTacticalCharacterDialogue_CallsLua( pSoldier, ADE_CONSUMEITEM, pObj->usItem );
// use up object // use up object
UseKitPoints( pObj, statusused, pSoldier ); UseKitPoints( pObj, statusused, pSoldier );