[Scummvm-git-logs] scummvm master -> 1e9ee2777bcb4e147a9712e283ceacd14e11b3c9

sev- noreply at scummvm.org
Sun Feb 5 21:07:07 UTC 2023 

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

Summary:
cae5e1cadd JANITORIAL: Fix namespace comments
1e9ee2777b IMMORTAL: Sort files alphabetically in module.mk


Commit: cae5e1cadd4f26c73b4f66f1f10f286acbc2ebf3
    https://github.com/scummvm/scummvm/commit/cae5e1cadd4f26c73b4f66f1f10f286acbc2ebf3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-05T22:04:44+01:00

Commit Message:
JANITORIAL: Fix namespace comments

Changed paths:
    engines/immortal/bullet.cpp
    engines/immortal/compression.cpp
    engines/immortal/definitions.h
    engines/immortal/door.cpp
    engines/immortal/drawChr.cpp
    engines/immortal/flameSet.cpp
    engines/immortal/level.cpp
    engines/immortal/room.cpp
    engines/immortal/room.h
    engines/immortal/sprite_list.h
    engines/immortal/story.h
    engines/immortal/univ.cpp
    engines/immortal/utilities.h


diff --git a/engines/immortal/bullet.cpp b/engines/immortal/bullet.cpp
index e17e84c29f1..f6d225d29f6 100644
--- a/engines/immortal/bullet.cpp
+++ b/engines/immortal/bullet.cpp
@@ -29,4 +29,4 @@ namespace Immortal {
 
 
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/compression.cpp b/engines/immortal/compression.cpp
index 08d7055149e..11ecaf95152 100644
--- a/engines/immortal/compression.cpp
+++ b/engines/immortal/compression.cpp
@@ -258,4 +258,4 @@ void ImmortalEngine::appendList(uint16 codeW, uint16 k, uint16 &hash, uint16 &fi
 	}
 }
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/definitions.h b/engines/immortal/definitions.h
index d19c3debad6..510b6cf0367 100644
--- a/engines/immortal/definitions.h
+++ b/engines/immortal/definitions.h
@@ -235,6 +235,6 @@ enum SObjType {
 };
 
 
-} // namespace immortal
+} // namespace Immortal
 
 #endif
diff --git a/engines/immortal/door.cpp b/engines/immortal/door.cpp
index 187268dab31..f2b99d94efd 100644
--- a/engines/immortal/door.cpp
+++ b/engines/immortal/door.cpp
@@ -127,4 +127,4 @@ void ImmortalEngine::doorCloseSecret() {}
 void ImmortalEngine::doorInit() {}
 void ImmortalEngine::doorClrLock() {}
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/drawChr.cpp b/engines/immortal/drawChr.cpp
index b898849b113..5f8e4e8dff9 100644
--- a/engines/immortal/drawChr.cpp
+++ b/engines/immortal/drawChr.cpp
@@ -43,4 +43,4 @@ void ImmortalEngine::drawURHC(int chr, int x, int y) {}
 void ImmortalEngine::drawLLHC(int chr, int x, int y) {}
 void ImmortalEngine::drawLRHC(int chr, int x, int y) {}
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/flameSet.cpp b/engines/immortal/flameSet.cpp
index a5f48744881..8bb4ec3abce 100644
--- a/engines/immortal/flameSet.cpp
+++ b/engines/immortal/flameSet.cpp
@@ -148,4 +148,4 @@ int Room::flameGetCyc(Flame *f, int first) {
 	}
 }
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/level.cpp b/engines/immortal/level.cpp
index 67a92b702d9..1fa299e72ae 100644
--- a/engines/immortal/level.cpp
+++ b/engines/immortal/level.cpp
@@ -153,4 +153,4 @@ bool ImmortalEngine::levelIsShowRoom(int r) {
 	return false;
 }
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/room.cpp b/engines/immortal/room.cpp
index 47de77211fb..da508ec8731 100644
--- a/engines/immortal/room.cpp
+++ b/engines/immortal/room.cpp
@@ -85,4 +85,4 @@ bool Room::getWallNormal(uint8 x, uint8 y, uint8 xPrev, uint8 yPrev, int id) {
 	return true;
 }
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/room.h b/engines/immortal/room.h
index b6bf67833e7..4a055259824 100644
--- a/engines/immortal/room.h
+++ b/engines/immortal/room.h
@@ -211,6 +211,6 @@ public:
 	void univAddSprite(uint16 vX, uint16 vY, uint16 x, uint16 y, SpriteName s, int img, uint16 p);
 };
 
-} // namespace immortal
+} // namespace Immortal
 
 #endif
diff --git a/engines/immortal/sprite_list.h b/engines/immortal/sprite_list.h
index e301a5089ac..686020474aa 100644
--- a/engines/immortal/sprite_list.h
+++ b/engines/immortal/sprite_list.h
@@ -294,6 +294,6 @@ enum SpriteName {
 	kFont
 };
 
-} // namespace immortal
+} // namespace Immortal
 
 #endif
diff --git a/engines/immortal/story.h b/engines/immortal/story.h
index b3cfd1732aa..edce41f8161 100644
--- a/engines/immortal/story.h
+++ b/engines/immortal/story.h
@@ -254,6 +254,6 @@ struct Story {
 	CArray2D<SMonster> _monsters;
 };
 
-} // namespace immortal
+} // namespace Immortal
 
 #endif
diff --git a/engines/immortal/univ.cpp b/engines/immortal/univ.cpp
index 9458d645f1e..3b8fbd2c7d8 100644
--- a/engines/immortal/univ.cpp
+++ b/engines/immortal/univ.cpp
@@ -28,4 +28,4 @@ void Room::univAddSprite(uint16 vX, uint16 vY, uint16 x, uint16 y, SpriteName s,
 	//g_immortal->addSprite(vX, vY, s, img, x, y, p);
 }
 
-} // namespace immortal
+} // namespace Immortal
diff --git a/engines/immortal/utilities.h b/engines/immortal/utilities.h
index 79e76efebf1..1bfbfcbe25c 100644
--- a/engines/immortal/utilities.h
+++ b/engines/immortal/utilities.h
@@ -79,7 +79,7 @@ void delay8(int j);                                 // || /8
 bool inside(uint8 dist, uint8 centX, uint8 centY, uint8 pointX, uint8 pointY);
 bool insideRect(uint8 rectX, uint8 rectY, uint8 w, uint8 h, uint8 pointX, uint8 pointY);
 
-}; // namespace Util
+}; // namespace Utilities
 
 }; // namespace Immortal
 


Commit: 1e9ee2777bcb4e147a9712e283ceacd14e11b3c9
    https://github.com/scummvm/scummvm/commit/1e9ee2777bcb4e147a9712e283ceacd14e11b3c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-05T22:06:40+01:00

Commit Message:
IMMORTAL: Sort files alphabetically in module.mk

Changed paths:
    engines/immortal/module.mk


diff --git a/engines/immortal/module.mk b/engines/immortal/module.mk
index 3d98cfe2729..54038fbe0a0 100644
--- a/engines/immortal/module.mk
+++ b/engines/immortal/module.mk
@@ -1,24 +1,24 @@
 MODULE := engines/immortal
 
 MODULE_OBJS = \
-	metaengine.o \
-	utilities.o \
+	bullet.o \
+	compression.o \
+	cycle.o \
+	door.o \
 	disk.o \
+	drawChr.o \
+	flameSet.o \
 	immortal.o \
 	kernal.o \
+	level.o \
 	logic.o \
-	sprites.o \
-	compression.o \
+	metaengine.o \
 	misc.o \
-	cycle.o \
-	drawChr.o \
-	level.o \
-	story.o \
 	room.o \
-	flameSet.o \
-	univ.o \
-	door.o \
-	bullet.o 
+	sprites.o \
+	story.o \
+	utilities.o \
+	univ.o
 
 #	object.o \
 #	monster.o \

More information about the Scummvm-git-logs mailing list