DM: Reorder DisplayMan::D24_clearScrenBox parameters

6 files changed, 19 insertions, 19 deletions

diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index 8cac2c732a..125bdde4ea 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -675,12 +675,12 @@ void ChampionMan::f287_drawChampionBarGraphs(ChampionIndex champIndex) {
 		if (barGraphHeight < 25) {

 			box._y1 = 2;

 			box._y1 = 27 - barGraphHeight + 1;

-			_vm->_displayMan->D24_clearScreenBox(g46_ChampionColor[champIndex], box);

+			_vm->_displayMan->D24_fillScreenBox(box, g46_ChampionColor[champIndex]);

 		}

 		if (barGraphHeight) {

 			box._y1 = 27 - barGraphHeight;

 			box._y2 = 26 + 1;

-			_vm->_displayMan->D24_clearScreenBox(g46_ChampionColor[champIndex], box);

+			_vm->_displayMan->D24_fillScreenBox(box, g46_ChampionColor[champIndex]);

 		}

 		box._x1 += 7;

 		box._x2 += 7;

@@ -738,7 +738,7 @@ void ChampionMan::f292_drawChampionState(ChampionIndex champIndex) {
 		box._x1 = champStatusBoxX;

 		box._x2 = box._x1 + 66 + 1;

 		if (champ->_currHealth) {

-			dispMan.D24_clearScreenBox(k12_ColorDarkestGray, box);

+			dispMan.D24_fillScreenBox(box, k12_ColorDarkestGray);

 			int16 nativeBitmapIndices[3];

 			for (int16 i = 0; i < 3; ++i)

 				nativeBitmapIndices[i] = 0;

@@ -786,7 +786,7 @@ void ChampionMan::f292_drawChampionState(ChampionIndex champIndex) {
 			box._y2 = 6 + 1;

 			box._x1 = champStatusBoxX;

 			box._x2 = box._x1 + 42 + 1;

-			dispMan.D24_clearScreenBox(k1_ColorDarkGary, box);

+			dispMan.D24_fillScreenBox(box, k1_ColorDarkGary);

 			_vm->_textMan->f53_printToLogicalScreen(champStatusBoxX + 1, 5, AL_0_colorIndex, k1_ColorDarkGary, champ->_name);

 		}

 	}

@@ -852,7 +852,7 @@ void ChampionMan::f292_drawChampionState(ChampionIndex champIndex) {
 		int16 AL_0_championIconIndex = M26_championIconIndex(champ->_cell, _vm->_dungeonMan->_g308_partyDir);

 

 		if ((champAttributes & k28_ChampionIcons) && (eventMan._g599_useChampionIconOrdinalAsMousePointerBitmap != _vm->M0_indexToOrdinal(AL_0_championIconIndex))) {

-			dispMan.D24_clearScreenBox(g46_ChampionColor[champIndex], g54_BoxChampionIcons[AL_0_championIconIndex]);

+			dispMan.D24_fillScreenBox(g54_BoxChampionIcons[AL_0_championIconIndex], g46_ChampionColor[champIndex]);

 			dispMan.f132_blitToBitmap(dispMan.f489_getBitmap(k28_ChampionIcons),

 									  dispMan._g348_bitmapScreen,

 									  g54_BoxChampionIcons[AL_0_championIconIndex << 2],

diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
index 226b616c50..a4d1b6d640 100644
--- a/engines/dm/eventman.cpp
+++ b/engines/dm/eventman.cpp
@@ -614,8 +614,8 @@ void EventManager::f282_commandProcessCommands160To162ClickInResurrectReincarnat
 		box._x1 = championIndex * k69_ChampionStatusBoxSpacing;
 		box._x2 = box._x1 + 66 + 1;
 		dispMan._g578_useByteBoxCoordinates = false;
-		dispMan.D24_clearScreenBox(k0_ColorBlack, box);
-		dispMan.D24_clearScreenBox(k0_ColorBlack, g54_BoxChampionIcons[champMan.M26_championIconIndex(champ->_cell, dunMan._g308_partyDir) * 2]);
+		dispMan.D24_fillScreenBox(box, k0_ColorBlack);
+		dispMan.D24_fillScreenBox(g54_BoxChampionIcons[champMan.M26_championIconIndex(champ->_cell, dunMan._g308_partyDir) * 2], k0_ColorBlack);
 		warning("F0457_START_DrawEnabledMenus_CPSF");
 		warning("F0078_MOUSE_ShowPointer");
 		return;
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index a91d6ee7a8..79669a11a4 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -725,7 +725,7 @@ void DisplayMan::setUpScreens(uint16 width, uint16 height) {
 	delete[] _g74_tmpBitmap;
 	delete[] _g348_bitmapScreen;
 	_g348_bitmapScreen = new byte[_screenWidth * _screenHeight];
-	clearScreen(k0_ColorBlack);
+	fillScreen(k0_ColorBlack);
 }
 
 void DisplayMan::f479_loadGraphics() {
@@ -1027,7 +1027,7 @@ void DisplayMan::f132_blitToBitmap(byte *srcBitmap, byte *destBitmap, Box &box,
 		}
 }
 
-void DisplayMan::D24_clearScreenBox(Color color, Box &box) {
+void DisplayMan::D24_fillScreenBox(Box &box, Color color) {
 	uint16 width = box._x2 - box._x1;
 	for (int16 y = box._y1; y < box._y2; ++y)
 		memset(_g348_bitmapScreen + y * _screenWidth + box._x1, color, sizeof(byte) * width);
@@ -1559,7 +1559,7 @@ void DisplayMan::f128_drawDungeon(direction dir, int16 posX, int16 posY) {
 	f97_drawViewport((_vm->_dungeonMan->_g309_partyMapIndex != k255_mapIndexEntrance) ? 1 : 0);
 }
 
-void DisplayMan::clearScreen(Color color) {
+void DisplayMan::fillScreen(Color color) {
 	memset(getCurrentVgaBuffer(), color, sizeof(byte) * _screenWidth * _screenHeight);
 }
 
diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h
index 1305322e72..72f9fa6cff 100644
--- a/engines/dm/gfx.h
+++ b/engines/dm/gfx.h
@@ -561,9 +561,9 @@ public:
 	byte *f114_getExplosionBitmap(uint16 explosionAspIndex, uint16 scale, int16 &returnPixelWidth, int16 &returnHeight); // @ F0114_DUNGEONVIEW_GetExplosionBitmap
 
 	void f134_fillBitmap(byte *bitmap, uint16 width, uint16 height, Color color); // @ F0134_VIDEO_FillBitmap
-	void clearScreen(Color color);
-	void D24_clearScreenBox(Color color, Box &box); // @ D24_FillScreenBox, F0550_VIDEO_FillScreenBox
-	void f135_fillBoxBitmap(byte *destBitmap, Box &box, Color color, int16 pixelWidth, int16 height);
+	void fillScreen(Color color);
+	void D24_fillScreenBox(Box &box, Color color); // @ D24_FillScreenBox, F0550_VIDEO_FillScreenBox
+	void f135_fillBoxBitmap(byte *destBitmap, Box &box, Color color, int16 pixelWidth, int16 height); // @ F0135_VIDEO_FillBox
 	void f128_drawDungeon(direction dir, int16 posX, int16 posY); // @ F0128_DUNGEONVIEW_Draw_CPSF
 	void updateScreen();
 	void f97_drawViewport(int16 palSwitchingRequestedState); // @ F0097_DUNGEONVIEW_DrawViewport
diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp
index 9718a57be2..527fea3da3 100644
--- a/engines/dm/inventory.cpp
+++ b/engines/dm/inventory.cpp
@@ -138,7 +138,7 @@ void InventoryMan::f343_drawPanelHorizontalBar(int16 x, int16 y, int16 pixelWidt
 	box._y1 = y;
 	box._y2 = box._y1 + 6 + 1;
 	_vm->_displayMan->_g578_useByteBoxCoordinates = false;
-	_vm->_displayMan->D24_clearScreenBox(color, box);
+	_vm->_displayMan->D24_fillScreenBox(box, color);
 }
 
 void InventoryMan::f344_drawPanelFoodOrWaterBar(int16 amount, int16 y, Color color) {
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index ee023e7522..38b974bb79 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -90,7 +90,7 @@ void MenuMan::f386_drawActionIcon(ChampionIndex championIndex) {
 	box._y2 = 120 + 1;

 	dm._g578_useByteBoxCoordinates = false;

 	if (!champion._currHealth) {

-		dm.D24_clearScreenBox(k0_ColorBlack, box);

+		dm.D24_fillScreenBox(box, k0_ColorBlack);

 		return;

 	}

 	byte *bitmapIcon = dm._g74_tmpBitmap;

@@ -107,7 +107,7 @@ void MenuMan::f386_drawActionIcon(ChampionIndex championIndex) {
 	_vm->_objectMan->f36_extractIconFromBitmap(iconIndex, bitmapIcon);

 	dm.f129_blitToBitmapShrinkWithPalChange(bitmapIcon, 16, 16, bitmapIcon, 16, 16, g498_PalChangesActionAreaObjectIcon);

 T0386006:

-	dm.D24_clearScreenBox(k4_ColorCyan, box);

+	dm.D24_fillScreenBox(box, k4_ColorCyan);

 	Box box2;

 	box2._x1 = box._x1 + 2;

 	box2._x2 = box._x2 - 2; // no need to add +1 for exclusive boundaries, box already has that

@@ -198,7 +198,7 @@ void MenuMan::f387_drawActionArea() {
 

 	warning("MISSING CODE: F0077_MOUSE_HidePointer_CPSE");

 	dispMan._g578_useByteBoxCoordinates = false;

-	dispMan.D24_clearScreenBox(k0_ColorBlack, g1_BoxActionArea);

+	dispMan.D24_fillScreenBox(g1_BoxActionArea, k0_ColorBlack);

 	if (_g509_actionAreaContainsIcons) {

 		for (uint16 champIndex = k0_ChampionFirst; champIndex < champMan._g305_partyChampionCount; ++champIndex)

 			f386_drawActionIcon((ChampionIndex)champIndex);

@@ -248,7 +248,7 @@ void MenuMan::f393_drawSpellAreaControls(ChampionIndex champIndex) {
 	for (uint16 i = 0; i < 4; ++i)

 		champCurrHealth[i] = champMan._gK71_champions[i]._currHealth;

 	warning("MISSING CODE: F0077_MOUSE_HidePointer_CPSE");

-	dispMan.D24_clearScreenBox(k0_ColorBlack, g504_BoxSpellAreaControls);

+	dispMan.D24_fillScreenBox(g504_BoxSpellAreaControls, k0_ColorBlack);

 	int16 champCount = champMan._g305_partyChampionCount;

 	switch (champIndex) {

 	case k0_ChampionFirst:

@@ -352,7 +352,7 @@ void MenuMan::f394_setMagicCasterAndDrawSpellArea(int16 champIndex) {
 		champMan._g514_magicCasterChampionIndex = kM1_ChampionNone;

 		warning("MISSING CODE: F0077_MOUSE_HidePointer_CPSE");

 		dispMan._g578_useByteBoxCoordinates = false;

-		dispMan.D24_clearScreenBox(k0_ColorBlack, g0_BoxSpellArea);

+		dispMan.D24_fillScreenBox(g0_BoxSpellArea, k0_ColorBlack);

 		warning("MISSING CODE: F0078_MOUSE_ShowPointer");

 		return;

 	}