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

Update LuaInitNPCs.cpp

Browse Source 
convert l_ACTION_ITEM_SEX (lua_State *L) to use SoldierID properly
This commit is contained in:
Asdow
2024-11-15 01:34:10 +02:00
parent 337cf1804f
commit cba88ab2bc
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+16 -16
View File
@@ -7129,7 +7129,7 @@ static int l_ACTION_ITEM_SEX (lua_State *L)
if ( ! (gTacticalStatus.uiFlags & INCOMBAT) ) if ( ! (gTacticalStatus.uiFlags & INCOMBAT) )
{ {
UINT16 ubID; SoldierID soldier;
OBJECTTYPE DoorCloser; OBJECTTYPE DoorCloser;
INT16 sTeleportSpot; INT16 sTeleportSpot;
INT16 sDoorSpot; INT16 sDoorSpot;
@@ -7142,16 +7142,16 @@ static int l_ACTION_ITEM_SEX (lua_State *L)
if ( TileIsOutOfBounds(sGridNo) ) if ( TileIsOutOfBounds(sGridNo) )
return 0; return 0;
ubID = WhoIsThere2( sGridNo, 0 ); soldier = WhoIsThere2( sGridNo, 0 );
if ( (ubID != NOBODY) && (MercPtrs[ ubID ]->bTeam == gbPlayerNum) ) if ( (soldier != NOBODY) && (soldier->bTeam == gbPlayerNum) )
{ {
if ( InARoom( sGridNo, &usRoom ) && InARoom( MercPtrs[ ubID ]->sOldGridNo, &usOldRoom ) && usOldRoom != usRoom ) if ( InARoom( sGridNo, &usRoom ) && InARoom( soldier->sOldGridNo, &usOldRoom ) && usOldRoom != usRoom )
{ {
// also require there to be a miniskirt civ in the room // also require there to be a miniskirt civ in the room
if ( HookerInRoom( usRoom ) ) if ( HookerInRoom( usRoom ) )
{ {
// stop the merc... // stop the merc...
MercPtrs[ ubID ]->EVENT_StopMerc( MercPtrs[ ubID ]->sGridNo, MercPtrs[ ubID ]->ubDirection ); soldier->EVENT_StopMerc( soldier->sGridNo, soldier->ubDirection );
if ( sGridNo == gModSettings.iCarlaDoorGridNo +1 ) if ( sGridNo == gModSettings.iCarlaDoorGridNo +1 )
{ {
@@ -7181,25 +7181,25 @@ static int l_ACTION_ITEM_SEX (lua_State *L)
PerformItemAction( sDoorSpot, &DoorCloser ); PerformItemAction( sDoorSpot, &DoorCloser );
// Flugente: additional dialogue // Flugente: additional dialogue
AdditionalTacticalCharacterDialogue_CallsLua( MercPtrs[ubID], ADE_SEX ); AdditionalTacticalCharacterDialogue_CallsLua( soldier, ADE_SEX );
// have sex // have sex
HandleNPCDoAction( 0, NPC_ACTION_SEX, 0 ); HandleNPCDoAction( 0, NPC_ACTION_SEX, 0 );
// move the merc outside of the room again // move the merc outside of the room again
sTeleportSpot = FindGridNoFromSweetSpotWithStructData( MercPtrs[ ubID ], STANDING, sTeleportSpot, 2, &ubDirection, FALSE ); sTeleportSpot = FindGridNoFromSweetSpotWithStructData( soldier, STANDING, sTeleportSpot, 2, &ubDirection, FALSE );
MercPtrs[ ubID ]->ChangeSoldierState( STANDING, 0, TRUE ); soldier->ChangeSoldierState( STANDING, 0, TRUE );
TeleportSoldier( MercPtrs[ ubID ], sTeleportSpot, FALSE ); TeleportSoldier( soldier, sTeleportSpot, FALSE );
HandleMoraleEvent( MercPtrs[ ubID ], MORALE_SEX, gWorldSectorX, gWorldSectorY, gbWorldSectorZ ); HandleMoraleEvent( soldier, MORALE_SEX, gWorldSectorX, gWorldSectorY, gbWorldSectorZ );
FatigueCharacter( MercPtrs[ ubID ] ); FatigueCharacter( soldier );
FatigueCharacter( MercPtrs[ ubID ] ); FatigueCharacter( soldier );
FatigueCharacter( MercPtrs[ ubID ] ); FatigueCharacter( soldier );
FatigueCharacter( MercPtrs[ ubID ] ); FatigueCharacter( soldier );
DirtyMercPanelInterface( MercPtrs[ ubID ], DIRTYLEVEL1 ); DirtyMercPanelInterface( soldier, DIRTYLEVEL1 );
// Flugente: we might get a disease from this... // Flugente: we might get a disease from this...
HandlePossibleInfection( MercPtrs[ubID], NULL, INFECTION_TYPE_SEX ); HandlePossibleInfection( soldier, NULL, INFECTION_TYPE_SEX );
} }
} }
} }