Skip to content

Commit

Permalink
STARTREK: Janitorial: Add end of namespace comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Strangerke authored and sev- committed Aug 9, 2018
1 parent cba0567 commit be4174d
Show file tree
Hide file tree
Showing 35 changed files with 34 additions and 38 deletions.
2 changes: 1 addition & 1 deletion engines/startrek/action.h
Expand Up @@ -96,6 +96,6 @@ struct Action {
} }
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/awaymission.cpp
Expand Up @@ -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? // the top of "runAwayMission". That can't really be done here. But does it matter?
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/bitmap.cpp
Expand Up @@ -71,4 +71,4 @@ StubBitmap::StubBitmap(int w, int h) {
pixelsArraySize = 0; pixelsArraySize = 0;
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/bitmap.h
Expand Up @@ -47,6 +47,6 @@ struct StubBitmap : Bitmap {
StubBitmap(int w, int h); StubBitmap(int w, int h);
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/common.cpp
Expand Up @@ -42,4 +42,4 @@ void serializeRect(Common::Rect rect, Common::Serializer &ser) {
ser.syncAsSint16LE(rect.bottom); ser.syncAsSint16LE(rect.bottom);
} }


} } // End of namespace StarTrek
3 changes: 1 addition & 2 deletions engines/startrek/common.h
Expand Up @@ -45,7 +45,6 @@ T max(T a, T b) {
Common::Rect getRectEncompassing(Common::Rect r1, Common::Rect r2); Common::Rect getRectEncompassing(Common::Rect r1, Common::Rect r2);
void serializeRect(Common::Rect rect, Common::Serializer &ser); void serializeRect(Common::Rect rect, Common::Serializer &ser);



} // End of namespace StarTrek
}


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/events.cpp
Expand Up @@ -185,4 +185,4 @@ void StarTrekEngine::addEventToQueue(const TrekEvent &e) {
_eventQueue.push_back(e); _eventQueue.push_back(e);
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/filestream.cpp
Expand Up @@ -77,4 +77,4 @@ bool FileStream::seek(int32 offset, int whence) {
return true; return true;
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/filestream.h
Expand Up @@ -56,6 +56,6 @@ class FileStream {


}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/fixedint.h
Expand Up @@ -185,6 +185,6 @@ typedef TFixedInt<int32, 32, 16> Fixed16;


typedef Fixed8 Angle; typedef Fixed8 Angle;


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/font.cpp
Expand Up @@ -78,4 +78,4 @@ const byte Font::_fontProperties[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}; };


} } // End of namespace StarTrek
3 changes: 1 addition & 2 deletions engines/startrek/font.h
Expand Up @@ -47,7 +47,6 @@ class Font {
const static byte _fontProperties[256]; const static byte _fontProperties[256];
}; };



} // End of namespace StarTrek
}


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/graphics.cpp
Expand Up @@ -756,4 +756,4 @@ void Graphics::drawBackgroundImage(const char *filename) {
delete[] palette; delete[] palette;
} }


} } // End of namespace StarTrek
3 changes: 1 addition & 2 deletions engines/startrek/graphics.h
Expand Up @@ -187,10 +187,9 @@ class Graphics {
bool _mouseLocked; bool _mouseLocked;
Sprite _lockedMouseSprite; Sprite _lockedMouseSprite;



public: public:
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/items.h
Expand Up @@ -255,6 +255,6 @@ const Item g_itemList[] = {


const int NUM_ITEMS = sizeof(g_itemList) / sizeof(struct Item) - 64; // 0x49 const int NUM_ITEMS = sizeof(g_itemList) / sizeof(struct Item) - 64; // 0x49


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/iwfile.cpp
Expand Up @@ -75,4 +75,4 @@ int IWFile::getClosestKeyPosition(int16 x, int16 y) {
return -1; return -1;
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/iwfile.h
Expand Up @@ -60,6 +60,6 @@ class IWFile {
uint16 _numEntries; uint16 _numEntries;
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/lzss.cpp
Expand Up @@ -81,5 +81,5 @@ Common::SeekableReadStream *decodeLZSS(Common::SeekableReadStream *indata, uint3
return new Common::MemoryReadStream(outLzssBufData, uncompressedSize, DisposeAfterUse::YES); return new Common::MemoryReadStream(outLzssBufData, uncompressedSize, DisposeAfterUse::YES);
} }


} } // End of namespace StarTrek


2 changes: 1 addition & 1 deletion engines/startrek/lzss.h
Expand Up @@ -54,4 +54,4 @@ class LzssReadStream : public Common::SeekableReadStream {
}; };
*/ */


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/math.cpp
Expand Up @@ -126,4 +126,4 @@ Angle StarTrekEngine::atan2(int32 deltaX, int32 deltaY) {
return Angle::fromRaw(angle); return Angle::fromRaw(angle);
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/menu.cpp
Expand Up @@ -1010,4 +1010,4 @@ void StarTrekEngine::saveTextDisplayMode(int value) {
// TODO; // TODO;
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/object.cpp
Expand Up @@ -24,4 +24,4 @@


namespace StarTrek { namespace StarTrek {


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/object.h
Expand Up @@ -180,7 +180,7 @@ struct Actor {


}; };


} } // End of namespace StarTrek


#endif #endif


2 changes: 1 addition & 1 deletion engines/startrek/room.cpp
Expand Up @@ -536,4 +536,4 @@ void Room::mccoyScan(int direction, TextRef text, bool changeDirection) {
showText(TX_SPEAKER_MCCOY, text); showText(TX_SPEAKER_MCCOY, text);
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/room.h
Expand Up @@ -2679,6 +2679,6 @@ class Room {
} _roomVar; } _roomVar;
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/saveload.cpp
Expand Up @@ -398,4 +398,4 @@ bool saveOrLoadMetadata(Common::SeekableReadStream *in, Common::WriteStream *out
return true; return true;
} }


} } // End of namespace StarTrek
1 change: 0 additions & 1 deletion engines/startrek/sound.cpp
Expand Up @@ -370,5 +370,4 @@ void Sound::midiDriverCallback(void *data) {
} }
} }



} // End of namespace StarTrek } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/sound.h
Expand Up @@ -103,6 +103,6 @@ class Sound {
static void midiDriverCallback(void *data); static void midiDriverCallback(void *data);
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/space.cpp
Expand Up @@ -551,4 +551,4 @@ Matrix StarTrekEngine::initSpeedMatrixForXZMovement(Angle angle, const Matrix &m
return matrix * matrix1; return matrix * matrix1;
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/space.h
Expand Up @@ -180,6 +180,6 @@ struct R3 {
// Maximum number of R3 objects in space at once // Maximum number of R3 objects in space at once
#define NUM_SPACE_OBJECTS 0x30 #define NUM_SPACE_OBJECTS 0x30


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/sprite.cpp
Expand Up @@ -75,4 +75,4 @@ void Sprite::saveLoadWithSerializer(Common::Serializer &ser) {
ser.syncAsSint16LE(drawY); ser.syncAsSint16LE(drawY);
} }


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/sprite.h
Expand Up @@ -74,6 +74,6 @@ struct Sprite : Common::Serializable {
virtual void saveLoadWithSerializer(Common::Serializer &ser); virtual void saveLoadWithSerializer(Common::Serializer &ser);
}; };


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/text.cpp
Expand Up @@ -2609,4 +2609,4 @@ extern const char *const g_gameStrings[] = {
"#SFX\\STATICU1#Ent... neu ... trans...", "#SFX\\STATICU1#Ent... neu ... trans...",
}; };


} } // End of namespace StarTrek
2 changes: 1 addition & 1 deletion engines/startrek/text.h
Expand Up @@ -2719,6 +2719,6 @@ enum GameStringIDs {
// defined in text.cpp // defined in text.cpp
extern const char *const g_gameStrings[]; extern const char *const g_gameStrings[];


} } // End of namespace StarTrek


#endif #endif
2 changes: 1 addition & 1 deletion engines/startrek/textbox.cpp
Expand Up @@ -930,4 +930,4 @@ void StarTrekEngine::cleanupTextInputSprite() {
_textInputBitmap.reset(); _textInputBitmap.reset();
} }


} } // End of namespace StarTrek

0 comments on commit be4174d

Please sign in to comment.