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

New feature: quest & intel map overlay

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23742&goto=353499&#msg_353499

Requires GameDir >= r2424

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-05-14 21:26:37 +00:00
parent 70ad3387a8
commit 100eea196b
28 changed files with 946 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+62
View File
@@ -876,6 +876,8 @@ static int l_AddArmsDealerAdditionalIntelDataItem( lua_State *L );
static int l_SetPhotoFactLaptopData( lua_State *L );
static int l_GetNumHostilesInSector( lua_State *L );
static int l_SetIntelAndQuestMapDataForSector( lua_State *L );
using namespace std;
UINT16 idProfil;
@@ -1758,6 +1760,8 @@ void IniFunction(lua_State *L, BOOLEAN bQuests )
lua_register( L, "SetPhotoFactLaptopData", l_SetPhotoFactLaptopData );
lua_register( L, "GetNumHostilesInSector", l_GetNumHostilesInSector );
lua_register( L, "SetIntelAndQuestMapDataForSector", l_SetIntelAndQuestMapDataForSector );
}
#ifdef NEWMUSIC
BOOLEAN LetLuaMusicControl(UINT8 Init)
@@ -13435,3 +13439,61 @@ static int l_GetNumHostilesInSector( lua_State *L )
return 1;
}
void LuaGetIntelAndQuestMapData( INT32 aLevel )
{
const char* filename = "scripts\\strategicmap.lua";
LuaScopeState _LS( true );
IniFunction( _LS.L(), TRUE );
IniGlobalGameSetting( _LS.L() );
SGP_THROW_IFFALSE( _LS.L.EvalFile( filename ), _BS( "Cannot open file: " ) << filename << _BS::cget );
LuaFunction( _LS.L, "GetIntelAndQuestMapData" ).Param<int>( aLevel ).Call( 1 );
}
extern void AddIntelAndQuestMapDataForSector( INT16 sSectorX, INT16 sSectorY, UINT8 ausMapColour, int asSymbol, STR16 aText, STR16 aText_Short );
static int l_SetIntelAndQuestMapDataForSector( lua_State *L )
{
int n = lua_gettop( L );
if ( n >= 4 )
{
INT16 sectorx = lua_tointeger( L, 1 );
INT16 sectory = lua_tointeger( L, 2 );
UINT8 mapcolour = lua_tointeger( L, 3 );
int symbol = lua_tointeger( L, 4 );
CHAR16 w_str[1024];
w_str[0] = '\0';
CHAR16 w_str_short[128];
w_str_short[0] = '\0';
if ( n >= 5 )
{
size_t len = 0;
const char* str = lua_tolstring( L, 5, &len );
MultiByteToWideChar( CP_UTF8, 0, str, -1, w_str, sizeof( w_str ) / sizeof( w_str[0] ) );
w_str[sizeof( w_str ) / sizeof( w_str[0] ) - 1] = '\0';
if ( n >= 6 )
{
size_t len_short = 0;
const char* str_short = lua_tolstring( L, 6, &len_short );
MultiByteToWideChar( CP_UTF8, 0, str_short, -1, w_str_short, sizeof( w_str_short ) / sizeof( w_str_short[0] ) );
w_str_short[sizeof( w_str_short ) / sizeof( w_str_short[0] ) - 1] = '\0';
}
}
AddIntelAndQuestMapDataForSector( sectorx, sectory, mapcolour, symbol, w_str, w_str_short );
}
return 0;
}