Commit MetaInfo

Revision6786231f2a22f1d99d19a224709b38785d50cf19 (tree)
Time2021-09-14 12:16:37
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

Fixed another Linux compile error.

Change Summary

Incremental Difference

diff -r 9ff1e50ac818 -r 6786231f2a22 src/p_acs.cpp
--- a/src/p_acs.cpp Mon Sep 13 22:35:46 2021 -0400
+++ b/src/p_acs.cpp Mon Sep 13 23:16:37 2021 -0400
@@ -12246,7 +12246,7 @@
1224612246
1224712247 //*****************************************************************************
1224812248 //
12249-AActor *ACS_GetScriptDamagePointers( int pointer )
12249+AActor *ACS_GetScriptDamagePointers( unsigned int pointer )
1225012250 {
1225112251 if ( g_pCurrentScript )
1225212252 {
diff -r 9ff1e50ac818 -r 6786231f2a22 src/p_acs.h
--- a/src/p_acs.h Mon Sep 13 22:35:46 2021 -0400
+++ b/src/p_acs.h Mon Sep 13 23:16:37 2021 -0400
@@ -1122,7 +1122,7 @@
11221122 // [AK] We need to access protected variables from this class when we tell the clients to print a HUD message.
11231123 friend void SERVERCOMMANDS_PrintACSHUDMessage( DLevelScript *pScript, const char *pszString, float fX, float fY, LONG lType, LONG lColor, float fHoldTime, float fInTime, float fOutTime, fixed_t Alpha, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags );
11241124 // [AK] If the current running script is a GAMEEVENT_ACTOR_DAMAGED event, this will return a pointer to the source, inflictor, or target actor.
1125- friend AActor *ACS_GetScriptDamagePointers( int pointer );
1125+ friend AActor *ACS_GetScriptDamagePointers( unsigned int pointer );
11261126 };
11271127
11281128 class DACSThinker : public DThinker
@@ -1183,7 +1183,7 @@
11831183 int ACS_GetTranslationIndex( FRemapTable *pTranslation );
11841184 int ACS_PushAndReturnDynamicString ( const FString &Work );
11851185 bool ACS_ExistsScript( int script );
1186-AActor *ACS_GetScriptDamagePointers( int pointer ); // [AK]
1186+AActor *ACS_GetScriptDamagePointers( unsigned int pointer ); // [AK]
11871187
11881188 // [BB] Export DoGiveInv
11891189 bool DoGiveInv(AActor *actor, const PClass *info, int amount);
Show on old repository browser