STARTREK: Janitorial: Add end of namespace comments

35 files changed, 34 insertions, 38 deletions

diff --git a/engines/startrek/action.h b/engines/startrek/action.h
index 4b8409e718..73e81d9c6f 100644
--- a/engines/startrek/action.h
+++ b/engines/startrek/action.h
@@ -96,6 +96,6 @@ struct Action {
 	}
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 4fb62cd8c3..ce70903fd7 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -764,4 +764,4 @@ void StarTrekEngine::loadRoomIndex(int roomIndex, int spawnIndex) {
 	// the top of "runAwayMission". That can't really be done here. But does it matter?
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/bitmap.cpp b/engines/startrek/bitmap.cpp
index 812b61a723..46d3a3a8cf 100644
--- a/engines/startrek/bitmap.cpp
+++ b/engines/startrek/bitmap.cpp
@@ -71,4 +71,4 @@ StubBitmap::StubBitmap(int w, int h) {
 	pixelsArraySize = 0;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/bitmap.h b/engines/startrek/bitmap.h
index 4ff285cbab..53edb09ab4 100644
--- a/engines/startrek/bitmap.h
+++ b/engines/startrek/bitmap.h
@@ -47,6 +47,6 @@ struct StubBitmap : Bitmap {
 	StubBitmap(int w, int h);
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/common.cpp b/engines/startrek/common.cpp
index 211a2f72bd..9fb4112cb4 100644
--- a/engines/startrek/common.cpp
+++ b/engines/startrek/common.cpp
@@ -42,4 +42,4 @@ void serializeRect(Common::Rect rect, Common::Serializer &ser) {
 	ser.syncAsSint16LE(rect.bottom);
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/common.h b/engines/startrek/common.h
index 126736494c..c7a512a9cd 100644
--- a/engines/startrek/common.h
+++ b/engines/startrek/common.h
@@ -45,7 +45,6 @@ T max(T a, T b) {
 Common::Rect getRectEncompassing(Common::Rect r1, Common::Rect r2);
 void serializeRect(Common::Rect rect, Common::Serializer &ser);
 
-
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/events.cpp b/engines/startrek/events.cpp
index a78a4177e4..a8b2552227 100644
--- a/engines/startrek/events.cpp
+++ b/engines/startrek/events.cpp
@@ -185,4 +185,4 @@ void StarTrekEngine::addEventToQueue(const TrekEvent &e) {
 	_eventQueue.push_back(e);
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/filestream.cpp b/engines/startrek/filestream.cpp
index e0916fc8e8..f90387c502 100644
--- a/engines/startrek/filestream.cpp
+++ b/engines/startrek/filestream.cpp
@@ -77,4 +77,4 @@ bool FileStream::seek(int32 offset, int whence) {
 	return true;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/filestream.h b/engines/startrek/filestream.h
index 3b52b20ae6..ddef496b2d 100644
--- a/engines/startrek/filestream.h
+++ b/engines/startrek/filestream.h
@@ -56,6 +56,6 @@ public:
 
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/fixedint.h b/engines/startrek/fixedint.h
index 65b481201b..605f166326 100644
--- a/engines/startrek/fixedint.h
+++ b/engines/startrek/fixedint.h
@@ -185,6 +185,6 @@ typedef TFixedInt<int32, 32, 16> Fixed16;
 
 typedef Fixed8 Angle;
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/font.cpp b/engines/startrek/font.cpp
index 6cd3f1b416..f9802348ed 100644
--- a/engines/startrek/font.cpp
+++ b/engines/startrek/font.cpp
@@ -78,4 +78,4 @@ const byte Font::_fontProperties[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/font.h b/engines/startrek/font.h
index 184d5abcd5..27f8fa2d9f 100644
--- a/engines/startrek/font.h
+++ b/engines/startrek/font.h
@@ -47,7 +47,6 @@ private:
 	const static byte _fontProperties[256];
 };
 
-
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/graphics.cpp b/engines/startrek/graphics.cpp
index 5d484edbc6..8a67c5bb18 100644
--- a/engines/startrek/graphics.cpp
+++ b/engines/startrek/graphics.cpp
@@ -756,4 +756,4 @@ void Graphics::drawBackgroundImage(const char *filename) {
 	delete[] palette;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/graphics.h b/engines/startrek/graphics.h
index 627b5bec47..46709cdd38 100644
--- a/engines/startrek/graphics.h
+++ b/engines/startrek/graphics.h
@@ -187,10 +187,9 @@ private:
 	bool _mouseLocked;
 	Sprite _lockedMouseSprite;
 
-
 public:
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/items.h b/engines/startrek/items.h
index fdf18258a2..1d930e71e4 100644
--- a/engines/startrek/items.h
+++ b/engines/startrek/items.h
@@ -255,6 +255,6 @@ const Item g_itemList[] = {
 
 const int NUM_ITEMS = sizeof(g_itemList) / sizeof(struct Item) - 64; // 0x49
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/iwfile.cpp b/engines/startrek/iwfile.cpp
index 9e9131f151..e61f6a09b0 100644
--- a/engines/startrek/iwfile.cpp
+++ b/engines/startrek/iwfile.cpp
@@ -75,4 +75,4 @@ int IWFile::getClosestKeyPosition(int16 x, int16 y) {
 	return -1;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/iwfile.h b/engines/startrek/iwfile.h
index 3f230ffb2b..dfd59d3ee7 100644
--- a/engines/startrek/iwfile.h
+++ b/engines/startrek/iwfile.h
@@ -60,6 +60,6 @@ private:
 	uint16 _numEntries;
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/lzss.cpp b/engines/startrek/lzss.cpp
index bc7e8898b6..66ad43f69f 100644
--- a/engines/startrek/lzss.cpp
+++ b/engines/startrek/lzss.cpp
@@ -81,5 +81,5 @@ Common::SeekableReadStream *decodeLZSS(Common::SeekableReadStream *indata, uint3
 	return new Common::MemoryReadStream(outLzssBufData, uncompressedSize, DisposeAfterUse::YES);
 }
 
-}
+} // End of namespace StarTrek
 
diff --git a/engines/startrek/lzss.h b/engines/startrek/lzss.h
index 15998121c2..29ed1ebb08 100644
--- a/engines/startrek/lzss.h
+++ b/engines/startrek/lzss.h
@@ -54,4 +54,4 @@ public:
 };
 */
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/math.cpp b/engines/startrek/math.cpp
index da81b1fa85..70b9ddb081 100644
--- a/engines/startrek/math.cpp
+++ b/engines/startrek/math.cpp
@@ -126,4 +126,4 @@ Angle StarTrekEngine::atan2(int32 deltaX, int32 deltaY) {
 	return Angle::fromRaw(angle);
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/menu.cpp b/engines/startrek/menu.cpp
index 5fbc8d5070..13ca59bc60 100644
--- a/engines/startrek/menu.cpp
+++ b/engines/startrek/menu.cpp
@@ -1010,4 +1010,4 @@ void StarTrekEngine::saveTextDisplayMode(int value) {
 	// TODO;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/object.cpp b/engines/startrek/object.cpp
index aafa138ffe..f0eb6d6d98 100644
--- a/engines/startrek/object.cpp
+++ b/engines/startrek/object.cpp
@@ -24,4 +24,4 @@
 
 namespace StarTrek {
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/object.h b/engines/startrek/object.h
index d412b8e6c1..3abcbe9091 100644
--- a/engines/startrek/object.h
+++ b/engines/startrek/object.h
@@ -180,7 +180,7 @@ public:
 
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
 
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 59ed8fb115..3be0783118 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -536,4 +536,4 @@ void Room::mccoyScan(int direction, TextRef text, bool changeDirection) {
 		showText(TX_SPEAKER_MCCOY, text);
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/room.h b/engines/startrek/room.h
index 272dd617b3..8b76a5707f 100644
--- a/engines/startrek/room.h
+++ b/engines/startrek/room.h
@@ -2679,6 +2679,6 @@ public:
 	} _roomVar;
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/saveload.cpp b/engines/startrek/saveload.cpp
index bb24587bb2..e7a288c6ad 100644
--- a/engines/startrek/saveload.cpp
+++ b/engines/startrek/saveload.cpp
@@ -398,4 +398,4 @@ bool saveOrLoadMetadata(Common::SeekableReadStream *in, Common::WriteStream *out
 	return true;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp
index 24a9758e29..f159e0c296 100644
--- a/engines/startrek/sound.cpp
+++ b/engines/startrek/sound.cpp
@@ -370,5 +370,4 @@ void Sound::midiDriverCallback(void *data) {
 	}
 }
 
-
 } // End of namespace StarTrek
diff --git a/engines/startrek/sound.h b/engines/startrek/sound.h
index 1b7021a30c..5df02bc1d1 100644
--- a/engines/startrek/sound.h
+++ b/engines/startrek/sound.h
@@ -103,6 +103,6 @@ private:
 	static void midiDriverCallback(void *data);
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
index 1acd47d495..054e78b37f 100644
--- a/engines/startrek/space.cpp
+++ b/engines/startrek/space.cpp
@@ -551,4 +551,4 @@ Matrix StarTrekEngine::initSpeedMatrixForXZMovement(Angle angle, const Matrix &m
 	return matrix * matrix1;
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/space.h b/engines/startrek/space.h
index 0d113cfb40..d980d23c1d 100644
--- a/engines/startrek/space.h
+++ b/engines/startrek/space.h
@@ -180,6 +180,6 @@ struct R3 {
 // Maximum number of R3 objects in space at once
 #define NUM_SPACE_OBJECTS 0x30
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/sprite.cpp b/engines/startrek/sprite.cpp
index dc01a917c9..63e24c2ccf 100644
--- a/engines/startrek/sprite.cpp
+++ b/engines/startrek/sprite.cpp
@@ -75,4 +75,4 @@ void Sprite::saveLoadWithSerializer(Common::Serializer &ser) {
 	ser.syncAsSint16LE(drawY);
 }
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/sprite.h b/engines/startrek/sprite.h
index d8cfc0b334..ab66adee30 100644
--- a/engines/startrek/sprite.h
+++ b/engines/startrek/sprite.h
@@ -74,6 +74,6 @@ struct Sprite : Common::Serializable {
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 };
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/text.cpp b/engines/startrek/text.cpp
index 3e9c6a2d21..0f3b3e63c7 100644
--- a/engines/startrek/text.cpp
+++ b/engines/startrek/text.cpp
@@ -2609,4 +2609,4 @@ extern const char *const g_gameStrings[] = {
 	"#SFX\\STATICU1#Ent... neu ... trans...",
 };
 
-}
+} // End of namespace StarTrek
diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index 594eede2b5..80c71131c1 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -2719,6 +2719,6 @@ enum GameStringIDs {
 // defined in text.cpp
 extern const char *const g_gameStrings[];
 
-}
+} // End of namespace StarTrek
 
 #endif
diff --git a/engines/startrek/textbox.cpp b/engines/startrek/textbox.cpp
index 1a05ecc1e8..e32f456bc0 100644
--- a/engines/startrek/textbox.cpp
+++ b/engines/startrek/textbox.cpp
@@ -930,4 +930,4 @@ void StarTrekEngine::cleanupTextInputSprite() {
 	_textInputBitmap.reset();
 }
 
-}
+} // End of namespace StarTrek