[Scummvm-git-logs] scummvm master -> c0a35f082516b3b2b6c02a5974d757b7e7cd8376

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0a35f0825 ICB: Eliminate macro function override


Commit: c0a35f082516b3b2b6c02a5974d757b7e7cd8376
    https://github.com/scummvm/scummvm/commit/c0a35f082516b3b2b6c02a5974d757b7e7cd8376
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-30T15:32:37+02:00

Commit Message:
ICB: Eliminate macro function override

Changed paths:
    engines/icb/gfx/psx_anims.h
    engines/icb/p4_generic_pc.h


diff --git a/engines/icb/gfx/psx_anims.h b/engines/icb/gfx/psx_anims.h
index ca3b966e883..ff5b6b5c597 100644
--- a/engines/icb/gfx/psx_anims.h
+++ b/engines/icb/gfx/psx_anims.h
@@ -33,11 +33,11 @@
 
 namespace ICB {
 
-static inline PXframe_PSX *psxFrameEnOfAnim(uint32 n, PXanim_PSX *pAnim, const char *file, const int32 line) {
+inline PXframe_PSX *PXFrameEnOfAnim(uint32 n, PXanim_PSX *pAnim) {
 	// Convert to the new schema
 	ConvertPXanim(pAnim);
 	if (n >= pAnim->frame_qty) {
-		Real_Fatal_error("Illegal frame %d %d %s %d", n, pAnim->frame_qty, file, line);
+		Real_Fatal_error("Illegal frame %d %d %s %d", n, pAnim->frame_qty);
 		error("Should exit with error-code -1");
 		return NULL;
 	}
diff --git a/engines/icb/p4_generic_pc.h b/engines/icb/p4_generic_pc.h
index 2db7b6592f2..7653c4afe61 100644
--- a/engines/icb/p4_generic_pc.h
+++ b/engines/icb/p4_generic_pc.h
@@ -58,9 +58,6 @@ typedef PXanim_PSX PXanim;
 // Very hacky #defines for function overloading
 #define PXWorldToFilm WorldToFilm
 
-// Very hacky #defines for function overloading
-// #define PXFrameEnOfAnim ADFrameEnOfAnim
-#define PXFrameEnOfAnim(n, pAnim) psxFrameEnOfAnim(n, pAnim, __FILE__, __LINE__)
 #define PXAngleOfVector AngleOfVector
 #define PXfabs fabs
 #define PXfmod fmod